diff options
Diffstat (limited to 'src/corelib/kernel/qbasictimer.cpp')
| -rw-r--r-- | src/corelib/kernel/qbasictimer.cpp | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp index 17711a355e6..613c0e696d6 100644 --- a/src/corelib/kernel/qbasictimer.cpp +++ b/src/corelib/kernel/qbasictimer.cpp @@ -101,13 +101,25 @@ QT_BEGIN_NAMESPACE /*! \fn int QBasicTimer::timerId() const + \obsolete Returns the timer's ID. + In new code use id() instead. + \sa QTimerEvent::timerId() */ /*! + \fn Qt::TimerId QBasicTimer::id() const + \since 6.8 + + Returns the timer's ID. + + \sa QTimerEvent::id() +*/ + +/*! \fn void QBasicTimer::start(int msec, QObject *object) \obsolete Use chrono overload instead. @@ -165,7 +177,7 @@ void QBasicTimer::start(std::chrono::milliseconds duration, Qt::TimerType timerT } stop(); if (obj) - id = int(eventDispatcher->registerTimer(duration, timerType, obj)); + m_id = eventDispatcher->registerTimer(duration, timerType, obj); } /*! @@ -175,15 +187,15 @@ void QBasicTimer::start(std::chrono::milliseconds duration, Qt::TimerType timerT */ void QBasicTimer::stop() { - if (id) { + if (isActive()) { QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(); - if (eventDispatcher && !eventDispatcher->unregisterTimer(Qt::TimerId(id))) { + if (eventDispatcher && !eventDispatcher->unregisterTimer(m_id)) { qWarning("QBasicTimer::stop: Failed. Possibly trying to stop from a different thread"); return; } - QAbstractEventDispatcherPrivate::releaseTimerId(id); + QAbstractEventDispatcherPrivate::releaseTimerId(m_id); } - id = 0; + m_id = Qt::TimerId::Invalid; } QT_END_NAMESPACE |