From ac05ee374692bb943cc825e23f731ac1e00d6c38 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 26 Aug 2024 10:07:56 +0200 Subject: [PATCH] QAbstractEventDispatcherV2: clean up override keywords Virtual functions should have exactly one of 'virtual', 'override' or 'final', because 'final' implies 'override' and 'override' implies 'virtual' (CppCoreGuidelines C.128; https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rh-override). So add 'override' to the dtor and remove 'virtual override' from the final functions. Amends af6afad3b390c0ed7de6d3c4314cc394d8f8e2c2. Change-Id: I65711c4ca87d522fc0d3afc994f8812914eab7d3 Reviewed-by: Giuseppe D'Angelo Reviewed-by: Thiago Macieira (cherry picked from commit e6dab10c32b2d57e8f47e5c16827a3c1560f2e27) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qabstracteventdispatcher.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index 54d8406dcfc..8d5d16d0464 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -100,7 +100,7 @@ class Q_CORE_EXPORT QAbstractEventDispatcherV2 : public QAbstractEventDispatcher public: explicit QAbstractEventDispatcherV2(QObject *parent = nullptr); - ~QAbstractEventDispatcherV2(); + ~QAbstractEventDispatcherV2() override; // new virtuals virtual void registerTimer(Qt::TimerId timerId, Duration interval, Qt::TimerType timerType, @@ -115,12 +115,11 @@ protected: private: // final overrides from V1 - virtual void registerTimer(int timerId, qint64 interval, Qt::TimerType timerType, - QObject *object) override final; - virtual bool unregisterTimer(int timerId) override final; - virtual QList registeredTimers(QObject *object) const override final; - - virtual int remainingTime(int timerId) override final; + void registerTimer(int timerId, qint64 interval, Qt::TimerType timerType, + QObject *object) final; + bool unregisterTimer(int timerId) final; + QList registeredTimers(QObject *object) const final; + int remainingTime(int timerId) final; }; #else using QAbstractEventDispatcherV2 = QAbstractEventDispatcher;