From 7023bb1d35a0c8f0a618f47065762f46465fc2df Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" 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 Reviewed-by: João Abecasis Reviewed-by: Robin Burchell Reviewed-by: Lars Knoll --- src/corelib/kernel/qtimerinfo_unix.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/corelib/kernel/qtimerinfo_unix.cpp') 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; -- cgit v1.2.3