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/tools/uic/customwidgetsinfo.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tools/uic/customwidgetsinfo.h') diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h index 3ce27d546c..944ed59215 100644 --- a/src/tools/uic/customwidgetsinfo.h +++ b/src/tools/uic/customwidgetsinfo.h @@ -43,10 +43,10 @@ class CustomWidgetsInfo : public TreeWalker public: CustomWidgetsInfo(); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; - void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; - void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; + void acceptCustomWidgets(DomCustomWidgets *node) override; + void acceptCustomWidget(DomCustomWidget *node) override; inline QStringList customWidgets() const { return m_customWidgets.keys(); } -- cgit v1.2.3