diff options
| -rw-r--r-- | src/corelib/kernel/qtimer.cpp | 10 | ||||
| -rw-r--r-- | src/corelib/kernel/qtimer.h | 8 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index d8d520ff58..90f29aa630 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -571,7 +571,7 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv */ /*! - \fn template<typename Functor> QMetaObject::Connection connectTo(Functor functor, Qt::ConnectionType connectionType = Qt::AutoConnection) + \fn template<typename Functor> QMetaObject::Connection callOnTimeout(Functor functor, Qt::ConnectionType connectionType = Qt::AutoConnection) \since 5.12 \overload @@ -585,9 +585,9 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv */ /*! - \fn template<typename Functor> QMetaObject::Connection connectTo(QObject *context, Functor functor, Qt::ConnectionType connectionType = Qt::AutoConnection) + \fn template<typename Functor> QMetaObject::Connection callOnTimeout(QObject *context, Functor functor, Qt::ConnectionType connectionType = Qt::AutoConnection) \since 5.12 - \overload connectTo() + \overload callOnTimeout() Creates a connection from the timeout() signal to \a functor to be placed in a specific event loop of \a context, and returns a handle to the connection. @@ -599,9 +599,9 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv */ /*! - \fn template<typename PointerToMemberFunction> QMetaObject::Connection connectTo(QObject *receiver, PointerToMemberFunction method, Qt::ConnectionType connectionType = Qt::AutoConnection) + \fn template<typename PointerToMemberFunction> QMetaObject::Connection callOnTimeout(QObject *receiver, PointerToMemberFunction method, Qt::ConnectionType connectionType = Qt::AutoConnection) \since 5.12 - \overload connectTo() + \overload callOnTimeout() Creates a connection from the timeout() signal to the \a method in the \a receiver object. Returns a handle to the connection. diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index f5c04c7f70..66f317c567 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -97,11 +97,11 @@ public: template<typename Functor, int> static void singleShot(int msec, Qt::TimerType timerType, const QObject *context, Functor functor); template <typename Functor> - QMetaObject::Connection connectTo(Functor slot, Qt::ConnectionType connectionType = Qt::AutoConnection); + QMetaObject::Connection callOnTimeout(Functor slot, Qt::ConnectionType connectionType = Qt::AutoConnection); template <typename Functor> - QMetaObject::Connection connectTo(const QObject *context, Functor slot, Qt::ConnectionType connectionType = Qt::AutoConnection); + QMetaObject::Connection callOnTimeout(const QObject *context, Functor slot, Qt::ConnectionType connectionType = Qt::AutoConnection); template <typename PointerToMemberFunction> - QMetaObject::Connection connectTo(const QObject *receiver, PointerToMemberFunction slot, Qt::ConnectionType connectionType = Qt::AutoConnection); + QMetaObject::Connection callOnTimeout(const QObject *receiver, PointerToMemberFunction slot, Qt::ConnectionType connectionType = Qt::AutoConnection); #else // singleShot to a QObject slot template <typename Duration, typename Func1> @@ -160,7 +160,7 @@ public: } template <typename ... Args> - QMetaObject::Connection connectTo(Args && ...args) + QMetaObject::Connection callOnTimeout(Args && ...args) { return QObject::connect(this, &QTimer::timeout, std::forward<Args>(args)... ); } diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp index 927ba49f83..8d194dafc1 100644 --- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp +++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp @@ -75,7 +75,7 @@ private slots: void dontBlockEvents(); void postedEventsShouldNotStarveTimers(); - void connectTo(); + void callOnTimeout(); }; void tst_QTimer::zeroTimer() @@ -979,7 +979,7 @@ void tst_QTimer::crossThreadSingleShotToFunctor() delete o; } -void tst_QTimer::connectTo() +void tst_QTimer::callOnTimeout() { QTimer timer; QSignalSpy timeoutSpy(&timer, &QTimer::timeout); @@ -989,9 +989,9 @@ void tst_QTimer::connectTo() auto context = new QObject(); int count = 0; - timer.connectTo([&count] { count++; }); - QMetaObject::Connection connection = timer.connectTo(context, [&count] { count++; }); - timer.connectTo(&timer, &QTimer::stop); + timer.callOnTimeout([&count] { count++; }); + QMetaObject::Connection connection = timer.callOnTimeout(context, [&count] { count++; }); + timer.callOnTimeout(&timer, &QTimer::stop); QTest::qWait(100); |