From 222d5c3e905a324f5508a0eb16114c5b3274af53 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Mon, 21 Jun 2010 17:02:16 +0200
Subject: code style changes applied to MR 697

---
 src/corelib/tools/qelapsedtimer_win.cpp | 7 +++----
 1 file 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()
-- 
cgit v0.12