diff options
Diffstat (limited to 'src/corelib/kernel/qelapsedtimer_win.cpp')
| -rw-r--r-- | src/corelib/kernel/qelapsedtimer_win.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/corelib/kernel/qelapsedtimer_win.cpp b/src/corelib/kernel/qelapsedtimer_win.cpp index 0c380b2f6a..a63290d2f8 100644 --- a/src/corelib/kernel/qelapsedtimer_win.cpp +++ b/src/corelib/kernel/qelapsedtimer_win.cpp @@ -72,10 +72,9 @@ static inline qint64 ticksToNanoseconds(qint64 ticks) qint64 seconds = ticks / counterFrequency; qint64 nanoSeconds = (ticks - seconds * counterFrequency) * 1000000000 / counterFrequency; return seconds * 1000000000 + nanoSeconds; - } else { - // GetTickCount(64) return milliseconds - return ticks * 1000000; } + // GetTickCount(64) returns milliseconds + return ticks * 1000000; } static inline qint64 nanosecondsToTicks(qint64 nsec) @@ -83,10 +82,9 @@ static inline qint64 nanosecondsToTicks(qint64 nsec) if (counterFrequency > 0) { // QueryPerformanceCounter uses an arbitrary frequency return double(nsec) * counterFrequency / 1000000000.; - } else { - // GetTickCount(64) uses milliseconds - return nsec / 1000000; } + // GetTickCount(64) uses milliseconds + return nsec / 1000000; } static quint64 getTickCount() @@ -116,10 +114,7 @@ QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW { resolveCounterFrequency(); - if (counterFrequency > 0) - return PerformanceCounter; - else - return TickCounter; + return counterFrequency > 0 ? PerformanceCounter : TickCounter; } bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW |