From 7023bb1d35a0c8f0a618f47065762f46465fc2df Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Thu, 5 Jan 2012 13:45:36 +0100
Subject: Do not always compile in QTimerInfoList::repairTimers()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This function is never called on systems that are guaranteed to have
a monotonic click (like Mac OS X). Remove the dead code from the
library.

Change-Id: I95852c8dffaa3a9747367f0abe4a4c62e4f86421
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/corelib/kernel/qtimerinfo_unix.cpp | 24 ++++++++++++------------
 src/corelib/kernel/qtimerinfo_unix_p.h |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp
index 1ffe12c656..c9ffee50bf 100644
--- a/src/corelib/kernel/qtimerinfo_unix.cpp
+++ b/src/corelib/kernel/qtimerinfo_unix.cpp
@@ -147,6 +147,18 @@ bool QTimerInfoList::timeChanged(timeval *delta)
     return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10);
 }
 
+/*
+  repair broken timer
+*/
+void QTimerInfoList::timerRepair(const timeval &diff)
+{
+    // repair all timers
+    for (int i = 0; i < size(); ++i) {
+        register QTimerInfo *t = at(i);
+        t->timeout = t->timeout + diff;
+    }
+}
+
 void QTimerInfoList::repairTimersIfNeeded()
 {
     if (QElapsedTimer::isMonotonic())
@@ -178,18 +190,6 @@ void QTimerInfoList::timerInsert(QTimerInfo *ti)
     insert(index+1, ti);
 }
 
-/*
-  repair broken timer
-*/
-void QTimerInfoList::timerRepair(const timeval &diff)
-{
-    // repair all timers
-    for (int i = 0; i < size(); ++i) {
-        register QTimerInfo *t = at(i);
-        t->timeout = t->timeout + diff;
-    }
-}
-
 inline timeval &operator+=(timeval &t1, int ms)
 {
     t1.tv_sec += ms / 1000;
diff --git a/src/corelib/kernel/qtimerinfo_unix_p.h b/src/corelib/kernel/qtimerinfo_unix_p.h
index c397703f58..89d4d457b0 100644
--- a/src/corelib/kernel/qtimerinfo_unix_p.h
+++ b/src/corelib/kernel/qtimerinfo_unix_p.h
@@ -86,6 +86,7 @@ class QTimerInfoList : public QList<QTimerInfo*>
     int msPerTick;
 
     bool timeChanged(timeval *delta);
+    void timerRepair(const timeval &);
 #endif
 
     // state variables used by activateTimers()
@@ -102,7 +103,6 @@ public:
 
     bool timerWait(timeval &);
     void timerInsert(QTimerInfo *);
-    void timerRepair(const timeval &);
 
     void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object);
     bool unregisterTimer(int timerId);
-- 
cgit v1.2.3