From a11d43e4239f1b269b2e8f39d7b6e10a23e8472a Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Tue, 25 Jun 2024 17:01:53 +0200 Subject: [PATCH] QAbstractEventDispatcher: restore virtual function order The commit af6afad3b390c0ed7de6d3c4314cc394d8f8e2c2 reordered the virtual functions in the Qt 6 block, which is known to be BiC. This patch restores the order of the virtual functions in Qt 6 block. To save some #ifdef'ery, it also duplicates the unregisterTimers() function declaration in the Qt 7 block. Amends af6afad3b390c0ed7de6d3c4314cc394d8f8e2c2. Found in Qt 6.8 API review. Change-Id: I30ff670fd89d37ee4261f77d16f1388dff8f6680 Reviewed-by: Thiago Macieira (cherry picked from commit 4f164ca9bc27338056ccf597e1aa00d3c4a1e88b) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qabstracteventdispatcher.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index ad97a93ba2a..418e674954e 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -54,6 +54,7 @@ public: // old, integer-based API virtual void registerTimer(int timerId, qint64 interval, Qt::TimerType timerType, QObject *object) = 0; virtual bool unregisterTimer(int timerId) = 0; + virtual bool unregisterTimers(QObject *object) = 0; virtual QList registeredTimers(QObject *object) const = 0; virtual int remainingTime(int timerId) = 0; @@ -64,10 +65,10 @@ public: #else virtual void registerTimer(Qt::TimerId timerId, Duration interval, Qt::TimerType timerType, QObject *object) = 0; virtual bool unregisterTimer(Qt::TimerId timerId) = 0; + virtual bool unregisterTimers(QObject *object) = 0; virtual QList timersForObject(QObject *object) const = 0; virtual Duration remainingTime(Qt::TimerId timerId) const = 0; #endif - virtual bool unregisterTimers(QObject *object) = 0; virtual void wakeUp() = 0; virtual void interrupt() = 0;