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/corelib/statemachine/qstate.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/statemachine/qstate.h') diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index 33f84c2de0..1b39d37f3d 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -116,10 +116,10 @@ Q_SIGNALS: void errorStateChanged(QPrivateSignal); protected: - void onEntry(QEvent *event) Q_DECL_OVERRIDE; - void onExit(QEvent *event) Q_DECL_OVERRIDE; + void onEntry(QEvent *event) override; + void onExit(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QState(QStatePrivate &dd, QState *parent); -- cgit v1.2.3