History

replace uint64_t with quint64 for Qt friendlyness

Stephen Birarda committed 12 years ago

Commit cda06d11 parent 7b4921e57 files · +347 −347Browse files

Showing the changes to interface/src/Application.cpp (1 of 57 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -2256,7 +2256,7 @@ void Application::updateCursor(float deltaTime) { · 2255 unmodified lines
2256 // watch mouse position, if it hasn't moved, hide the cursor2256 // watch mouse position, if it hasn't moved, hide the cursor
2257 bool underMouse = _glWidget->underMouse();2257 bool underMouse = _glWidget->underMouse();
2258 if (!_mouseHidden) {2258 if (!_mouseHidden) {
2259 uint64_t now = usecTimestampNow();2259 quint64 now = usecTimestampNow();
2260 int elapsed = now - _lastMouseMove;2260 int elapsed = now - _lastMouseMove;
2261 const int HIDE_CURSOR_TIMEOUT = 1 * 1000 * 1000; // 1 second2261 const int HIDE_CURSOR_TIMEOUT = 1 * 1000 * 1000; // 1 second
2262 if (elapsed > HIDE_CURSOR_TIMEOUT && (underMouse || !_seenMouseMove)) {2262 if (elapsed > HIDE_CURSOR_TIMEOUT && (underMouse || !_seenMouseMove)) {
@@ -3057,7 +3057,7 @@ void Application::displayOverlay() { · 794 unmodified lines
3057 // Show on-screen msec timer3057 // Show on-screen msec timer
3058 if (Menu::getInstance()->isOptionChecked(MenuOption::FrameTimer)) {3058 if (Menu::getInstance()->isOptionChecked(MenuOption::FrameTimer)) {
3059 char frameTimer[10];3059 char frameTimer[10];
3060 uint64_t mSecsNow = floor(usecTimestampNow() / 1000.0 + 0.5);3060 quint64 mSecsNow = floor(usecTimestampNow() / 1000.0 + 0.5);
3061 sprintf(frameTimer, "%d\n", (int)(mSecsNow % 1000));3061 sprintf(frameTimer, "%d\n", (int)(mSecsNow % 1000));
3062 int timerBottom = 3062 int timerBottom =
3063 (Menu::getInstance()->isOptionChecked(MenuOption::Stats) && 3063 (Menu::getInstance()->isOptionChecked(MenuOption::Stats) &&

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t