diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-06-21 15:02:16 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-06-21 15:02:16 (GMT) |
| commit | 222d5c3e905a324f5508a0eb16114c5b3274af53 (patch) | |
| tree | bf6f62d307fa8704b3f32086d3f3f9f921eb945e /src | |
| parent | 7113c6d4be87ead4f2be9afe64c6e81e3f6720a3 (diff) | |
| download | Qt-222d5c3e905a324f5508a0eb16114c5b3274af53.zip Qt-222d5c3e905a324f5508a0eb16114c5b3274af53.tar.gz Qt-222d5c3e905a324f5508a0eb16114c5b3274af53.tar.bz2 | |
code style changes applied to MR 697
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qelapsedtimer_win.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/tools/qelapsedtimer_win.cpp b/src/corelib/tools/qelapsedtimer_win.cpp index c7c160d..c77acaa 100644 --- a/src/corelib/tools/qelapsedtimer_win.cpp +++ b/src/corelib/tools/qelapsedtimer_win.cpp @@ -79,7 +79,7 @@ static void resolveLibs() done = true; } -static qint64 ticksToMilliseconds(qint64 ticks) +static inline qint64 ticksToMilliseconds(qint64 ticks) { if (counterFrequency > 0) { // QueryPerformanceCounter uses an arbitrary frequency @@ -122,11 +122,10 @@ QElapsedTimer::ClockType QElapsedTimer::clockType() { resolveLibs(); - if (counterFrequency > 0) { + if (counterFrequency > 0) return PerformanceCounter; - } else { + else return TickCounter; - } } bool QElapsedTimer::isMonotonic() |