From 44f5e466505b791d6d3097848036cbc885303f3b Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 20 Sep 2024 14:13:27 +0200 Subject: [PATCH] QCocoaEventDispatcher: add missing override keywords MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amends 17763a7b31c1f6df6f7725c4b67e5dcc4d3b00fb, but not picking back further than f8da484d5741d1191504eefddf5134fd7009e16a, to avoid provoking "inconsistent override" warnings. Change-Id: I463e391f4acb896641e5d3d120a52143b1a9a8a9 Reviewed-by: Tor Arne Vestbø (cherry picked from commit d4348cc9b4cadca3585872ee8632a47c6ec85101) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/cocoa/qcocoaeventdispatcher.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h index 96eb70dabc5..a2a46bea5d0 100644 --- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h +++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.h @@ -82,12 +82,12 @@ class QCocoaEventDispatcher : public QAbstractEventDispatcherV2 public: QCocoaEventDispatcher(QAbstractEventDispatcherPrivate &priv, 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 unregisterSocketNotifier(QSocketNotifier *notifier); + void registerSocketNotifier(QSocketNotifier *notifier) override; + void unregisterSocketNotifier(QSocketNotifier *notifier) override; void registerTimer(Qt::TimerId timerId, Duration interval, Qt::TimerType timerType, QObject *object) final; @@ -96,8 +96,8 @@ public: QList timersForObject(QObject *object) const final; Duration remainingTime(Qt::TimerId timerId) const final; - void wakeUp(); - void interrupt(); + void wakeUp() override; + void interrupt() override; static void clearCurrentThreadCocoaEventDispatcherInterruptFlag();