diff options
| author | Konrad Kujawa <konrad.kujawa@qt.io> | 2022-09-12 10:50:45 +0200 |
|---|---|---|
| committer | Konrad Kujawa <konrad.kujawa@qt.io> | 2022-09-13 09:33:40 +0200 |
| commit | 84c085273f21fc6365a7fbe99d98d726a161d000 (patch) | |
| tree | e1c472cbd1ff5f8de7b9392d578356dbc60792ab /src/corelib/kernel/qtimer.cpp | |
| parent | ac74b60c9c1101288eb2c558420ba69f675a2ee2 (diff) | |
Move QTimerPrivate to separate header
Pick-to: 6.4
Change-Id: Icf3f8701f3cced822f2241cb2c0d27cd8739efe1
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/corelib/kernel/qtimer.cpp')
| -rw-r--r-- | src/corelib/kernel/qtimer.cpp | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index 376b13e9f29..8a94603488d 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -3,6 +3,8 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qtimer.h" +#include "qtimer_p.h" + #include "qabstracteventdispatcher.h" #include "qcoreapplication.h" #include "qobject_p.h" @@ -12,23 +14,6 @@ QT_BEGIN_NAMESPACE -static constexpr int INV_TIMER = -1; // invalid timer id - -class QTimerPrivate : public QObjectPrivate -{ - Q_DECLARE_PUBLIC(QTimer) -public: - void setInterval(int msec) { q_func()->setInterval(msec); } - bool isActiveActualCalculation() const { return id >= 0; } - - int id = INV_TIMER; - Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS(QTimerPrivate, int, inter, &QTimerPrivate::setInterval, 0) - Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(QTimerPrivate, bool, single, false) - Q_OBJECT_BINDABLE_PROPERTY_WITH_ARGS(QTimerPrivate, Qt::TimerType, type, Qt::CoarseTimer) - Q_OBJECT_COMPUTED_PROPERTY(QTimerPrivate, bool, isActiveData, - &QTimerPrivate::isActiveActualCalculation) -}; - /*! \class QTimer \inmodule QtCore @@ -139,7 +124,7 @@ QTimer::QTimer(QObject *parent) QTimer::~QTimer() { - if (d_func()->id != INV_TIMER) // stop running timer + if (d_func()->id != QTimerPrivate::INV_TIMER) // stop running timer stop(); } @@ -200,7 +185,7 @@ int QTimer::timerId() const void QTimer::start() { Q_D(QTimer); - if (d->id != INV_TIMER) // stop running timer + if (d->id != QTimerPrivate::INV_TIMER) // stop running timer stop(); d->id = QObject::startTimer(d->inter, d->type); d->isActiveData.notify(); @@ -239,9 +224,9 @@ void QTimer::start(int msec) void QTimer::stop() { Q_D(QTimer); - if (d->id != INV_TIMER) { + if (d->id != QTimerPrivate::INV_TIMER) { QObject::killTimer(d->id); - d->id = INV_TIMER; + d->id = QTimerPrivate::INV_TIMER; d->isActiveData.notify(); } } @@ -721,7 +706,7 @@ void QTimer::setInterval(int msec) Q_D(QTimer); const bool intervalChanged = msec != d->inter; d->inter.setValue(msec); - if (d->id != INV_TIMER) { // create new timer + if (d->id != QTimerPrivate::INV_TIMER) { // create new timer QObject::killTimer(d->id); // restart timer d->id = QObject::startTimer(msec, d->type); // No need to call markDirty() for d->isActiveData here, @@ -755,7 +740,7 @@ QBindable<int> QTimer::bindableInterval() int QTimer::remainingTime() const { Q_D(const QTimer); - if (d->id != INV_TIMER) { + if (d->id != QTimerPrivate::INV_TIMER) { return QAbstractEventDispatcher::instance()->remainingTime(d->id); } |