From 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 10:36:49 +0200 Subject: Replace Q_DECL_OVERRIDE with override where possible Remaining uses of Q_DECL_OVERRIDE are in: src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.cpp doc/global/qt-cpp-defines.qdocconf (definition and documentation of Q_DECL_OVERRIDE) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba Reviewed-by: Lars Knoll Reviewed-by: Ville Voutilainen Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/widgets/statemachine/qbasickeyeventtransition_p.h | 4 ++-- src/widgets/statemachine/qbasicmouseeventtransition_p.h | 4 ++-- src/widgets/statemachine/qkeyeventtransition.h | 4 ++-- src/widgets/statemachine/qmouseeventtransition.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/widgets/statemachine') diff --git a/src/widgets/statemachine/qbasickeyeventtransition_p.h b/src/widgets/statemachine/qbasickeyeventtransition_p.h index d3b90f6104..5007b79739 100644 --- a/src/widgets/statemachine/qbasickeyeventtransition_p.h +++ b/src/widgets/statemachine/qbasickeyeventtransition_p.h @@ -80,8 +80,8 @@ public: void setModifierMask(Qt::KeyboardModifiers modifiers); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *) override; private: Q_DISABLE_COPY(QBasicKeyEventTransition) diff --git a/src/widgets/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h index d6d37eb03e..93d2a5ec61 100644 --- a/src/widgets/statemachine/qbasicmouseeventtransition_p.h +++ b/src/widgets/statemachine/qbasicmouseeventtransition_p.h @@ -83,8 +83,8 @@ public: void setHitTestPath(const QPainterPath &path); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *) override; private: Q_DISABLE_COPY(QBasicMouseEventTransition) diff --git a/src/widgets/statemachine/qkeyeventtransition.h b/src/widgets/statemachine/qkeyeventtransition.h index 23ce3c40be..b8c4a99710 100644 --- a/src/widgets/statemachine/qkeyeventtransition.h +++ b/src/widgets/statemachine/qkeyeventtransition.h @@ -66,8 +66,8 @@ public: void setModifierMask(Qt::KeyboardModifiers modifiers); protected: - void onTransition(QEvent *event) Q_DECL_OVERRIDE; - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + void onTransition(QEvent *event) override; + bool eventTest(QEvent *event) override; private: Q_DISABLE_COPY(QKeyEventTransition) diff --git a/src/widgets/statemachine/qmouseeventtransition.h b/src/widgets/statemachine/qmouseeventtransition.h index 3f40224d8c..49fc156a51 100644 --- a/src/widgets/statemachine/qmouseeventtransition.h +++ b/src/widgets/statemachine/qmouseeventtransition.h @@ -70,8 +70,8 @@ public: void setHitTestPath(const QPainterPath &path); protected: - void onTransition(QEvent *event) Q_DECL_OVERRIDE; - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + void onTransition(QEvent *event) override; + bool eventTest(QEvent *event) override; private: Q_DISABLE_COPY(QMouseEventTransition) -- cgit v1.2.3