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) --- .../compose/qcomposeplatforminputcontext.h | 10 +++++----- .../compose/qcomposeplatforminputcontextmain.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/platforminputcontexts/compose') diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h index f82280903d..4830959665 100644 --- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h +++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h @@ -58,11 +58,11 @@ public: QComposeInputContext(); ~QComposeInputContext(); - bool isValid() const Q_DECL_OVERRIDE; - void setFocusObject(QObject *object) Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; - void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE; - bool filterEvent(const QEvent *event) Q_DECL_OVERRIDE; + bool isValid() const override; + void setFocusObject(QObject *object) override; + void reset() override; + void update(Qt::InputMethodQueries) override; + bool filterEvent(const QEvent *event) override; protected: void clearComposeBuffer(); diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp index 97a7242ca6..6b33df65b9 100644 --- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp +++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp @@ -51,7 +51,7 @@ class QComposePlatformInputContextPlugin : public QPlatformInputContextPlugin Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "compose.json") public: - QComposeInputContext *create(const QString &, const QStringList &) Q_DECL_OVERRIDE; + QComposeInputContext *create(const QString &, const QStringList &) override; }; QComposeInputContext *QComposePlatformInputContextPlugin::create(const QString &system, const QStringList ¶mList) -- cgit v1.2.3