whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSingleShotTimer: use the Duration alias from the event dispatcher 

Just so we don't accidentally use different precisions. Amends commit
bfc7535a10.

Change-Id: I83dda2d36c904517b3c0fffd17b5258e88dd194e
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
bb10
Thiago Macieira 2024-02-18 19:22:07 -08:00
parent f8da484d57
commit af383319f6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/corelib/kernel/qsingleshottimer_p.h
View File

@ -31,13 +31,16 @@ class QSingleShotTimer : public QObject
Qt::TimerId timerId = Qt::TimerId::Invalid;
public:
// use the same duration type
using Duration = QAbstractEventDispatcher::Duration;
inline ~QSingleShotTimer();
inline QSingleShotTimer(std::chrono::nanoseconds interval, Qt::TimerType timerType,
inline QSingleShotTimer(Duration interval, Qt::TimerType timerType,
const QObject *r, const char *member);
inline QSingleShotTimer(std::chrono::nanoseconds interval, Qt::TimerType timerType,
inline QSingleShotTimer(Duration interval, Qt::TimerType timerType,
const QObject *r, QtPrivate::QSlotObjectBase *slotObj);
inline void startTimerForReceiver(std::chrono::nanoseconds interval, Qt::TimerType timerType,
inline void startTimerForReceiver(Duration interval, Qt::TimerType timerType,
const QObject *receiver);
Q_SIGNALS:
@ -47,7 +50,7 @@ private:
inline void timerEvent(QTimerEvent *) override;
};
QSingleShotTimer::QSingleShotTimer(std::chrono::nanoseconds interval, Qt::TimerType timerType,
QSingleShotTimer::QSingleShotTimer(Duration interval, Qt::TimerType timerType,
const QObject *r, const char *member)
: QObject(QAbstractEventDispatcher::instance())
{
@ -55,7 +58,7 @@ QSingleShotTimer::QSingleShotTimer(std::chrono::nanoseconds interval, Qt::TimerT
startTimerForReceiver(interval, timerType, r);
}
QSingleShotTimer::QSingleShotTimer(std::chrono::nanoseconds interval, Qt::TimerType timerType,
QSingleShotTimer::QSingleShotTimer(Duration interval, Qt::TimerType timerType,
const QObject *r, QtPrivate::QSlotObjectBase *slotObj)
: QObject(QAbstractEventDispatcher::instance())
{
@ -78,8 +81,8 @@ QSingleShotTimer::~QSingleShotTimer()
the same thread as where it will be handled, so that it fires reliably even
if the thread that set up the timer is busy.
*/
void QSingleShotTimer::startTimerForReceiver(std::chrono::nanoseconds interval,
Qt::TimerType timerType, const QObject *receiver)
void QSingleShotTimer::startTimerForReceiver(Duration interval, Qt::TimerType timerType,
const QObject *receiver)
{
if (receiver && receiver->thread() != thread()) {
// Avoid leaking the QSingleShotTimer instance in case the application exits before the