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

QCocoaEventDispatcher: add missing override keywords

Browse Source 
Amends 17763a7b31c1f6df6f7725c4b67e5dcc4d3b00fb, but not picking back
further than f8da484d5741d1191504eefddf5134fd7009e16a, to avoid
provoking "inconsistent override" warnings.

Change-Id: I463e391f4acb896641e5d3d120a52143b1a9a8a9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit d4348cc9b4cadca3585872ee8632a47c6ec85101)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2024-09-20 14:13:27 +02:00 committed by Qt Cherry-pick Bot
parent 185a1e09f1
commit 44f5e46650
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforms/cocoa/qcocoaeventdispatcher.h
View File

@ -82,12 +82,12 @@ class QCocoaEventDispatcher : public QAbstractEventDispatcherV2
public: public:
QCocoaEventDispatcher(QAbstractEventDispatcherPrivate &priv, QObject *parent = nullptr); QCocoaEventDispatcher(QAbstractEventDispatcherPrivate &priv, QObject *parent = nullptr);
explicit QCocoaEventDispatcher(QObject *parent = nullptr); explicit QCocoaEventDispatcher(QObject *parent = nullptr);
~QCocoaEventDispatcher(); ~QCocoaEventDispatcher() override;
bool processEvents(QEventLoop::ProcessEventsFlags flags); bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
void registerSocketNotifier(QSocketNotifier *notifier); void registerSocketNotifier(QSocketNotifier *notifier) override;
void unregisterSocketNotifier(QSocketNotifier *notifier); void unregisterSocketNotifier(QSocketNotifier *notifier) override;
void registerTimer(Qt::TimerId timerId, Duration interval, Qt::TimerType timerType, void registerTimer(Qt::TimerId timerId, Duration interval, Qt::TimerType timerType,
QObject *object) final; QObject *object) final;
@ -96,8 +96,8 @@ public:
QList<TimerInfoV2> timersForObject(QObject *object) const final; QList<TimerInfoV2> timersForObject(QObject *object) const final;
Duration remainingTime(Qt::TimerId timerId) const final; Duration remainingTime(Qt::TimerId timerId) const final;
void wakeUp(); void wakeUp() override;
void interrupt(); void interrupt() override;
static void clearCurrentThreadCocoaEventDispatcherInterruptFlag(); static void clearCurrentThreadCocoaEventDispatcherInterruptFlag();