diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-01-05 13:45:36 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-05 22:15:25 +0100 |
commit | 7023bb1d35a0c8f0a618f47065762f46465fc2df (patch) | |
tree | 1bf1380adfb1f6de3d051481e1922b08cd6cd18e /src/corelib/kernel | |
parent | c46654b3a5deb92f5ac2ce41be9d7a302dd04db5 (diff) |
Do not always compile in QTimerInfoList::repairTimers()
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>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qtimerinfo_unix.cpp | 24 | ||||
-rw-r--r-- | src/corelib/kernel/qtimerinfo_unix_p.h | 2 |
2 files changed, 13 insertions, 13 deletions
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); |