1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QAbstractEventDispatcher: restore virtual function order

Browse Source 
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 <thiago.macieira@intel.com>
(cherry picked from commit 4f164ca9bc27338056ccf597e1aa00d3c4a1e88b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Ivan Solovev 2024-06-25 17:01:53 +02:00 committed by Qt Cherry-pick Bot
parent 8fd1bbd2db
commit a11d43e423
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/kernel/qabstracteventdispatcher.h
View File

@ -54,6 +54,7 @@ public:
// old, integer-based API // old, integer-based API
virtual void registerTimer(int timerId, qint64 interval, Qt::TimerType timerType, QObject *object) = 0; virtual void registerTimer(int timerId, qint64 interval, Qt::TimerType timerType, QObject *object) = 0;
virtual bool unregisterTimer(int timerId) = 0; virtual bool unregisterTimer(int timerId) = 0;
virtual bool unregisterTimers(QObject *object) = 0;
virtual QList<TimerInfo> registeredTimers(QObject *object) const = 0; virtual QList<TimerInfo> registeredTimers(QObject *object) const = 0;
virtual int remainingTime(int timerId) = 0; virtual int remainingTime(int timerId) = 0;
@ -64,10 +65,10 @@ public:
#else #else
virtual void registerTimer(Qt::TimerId timerId, Duration interval, Qt::TimerType timerType, QObject *object) = 0; virtual void registerTimer(Qt::TimerId timerId, Duration interval, Qt::TimerType timerType, QObject *object) = 0;
virtual bool unregisterTimer(Qt::TimerId timerId) = 0; virtual bool unregisterTimer(Qt::TimerId timerId) = 0;
virtual bool unregisterTimers(QObject *object) = 0;
virtual QList<TimerInfoV2> timersForObject(QObject *object) const = 0; virtual QList<TimerInfoV2> timersForObject(QObject *object) const = 0;
virtual Duration remainingTime(Qt::TimerId timerId) const = 0; virtual Duration remainingTime(Qt::TimerId timerId) const = 0;
#endif #endif
virtual bool unregisterTimers(QObject *object) = 0;
virtual void wakeUp() = 0; virtual void wakeUp() = 0;
virtual void interrupt() = 0; virtual void interrupt() = 0;