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/cpp/cppwritedeclaration.h | 14 +++++++------- src/tools/uic/cpp/cppwriteincludes.h | 18 +++++++++--------- src/tools/uic/cpp/cppwriteinitialization.h | 28 ++++++++++++++-------------- src/tools/uic/customwidgetsinfo.h | 6 +++--- src/tools/uic/databaseinfo.h | 4 ++-- src/tools/uic/validator.h | 12 ++++++------ 6 files changed, 41 insertions(+), 41 deletions(-) (limited to 'src/tools') diff --git a/src/tools/uic/cpp/cppwritedeclaration.h b/src/tools/uic/cpp/cppwritedeclaration.h index ca2122293c..f83bfe8f50 100644 --- a/src/tools/uic/cpp/cppwritedeclaration.h +++ b/src/tools/uic/cpp/cppwritedeclaration.h @@ -45,13 +45,13 @@ struct WriteDeclaration : public TreeWalker { WriteDeclaration(Uic *uic); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; - void acceptButtonGroup(const DomButtonGroup *buttonGroup) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptLayout(DomLayout *node) override; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; + void acceptButtonGroup(const DomButtonGroup *buttonGroup) override; private: Uic *m_uic; diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h index 0d9c293efc..f91e1cf8ff 100644 --- a/src/tools/uic/cpp/cppwriteincludes.h +++ b/src/tools/uic/cpp/cppwriteincludes.h @@ -49,23 +49,23 @@ struct WriteIncludes : public TreeWalker { WriteIncludes(Uic *uic); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptProperty(DomProperty *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; + void acceptLayout(DomLayout *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptProperty(DomProperty *node) override; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; - void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; + void acceptCustomWidgets(DomCustomWidgets *node) override; + void acceptCustomWidget(DomCustomWidget *node) override; // // include hints // - void acceptIncludes(DomIncludes *node) Q_DECL_OVERRIDE; - void acceptInclude(DomInclude *node) Q_DECL_OVERRIDE; + void acceptIncludes(DomIncludes *node) override; + void acceptInclude(DomInclude *node) override; private: void add(const QString &className, bool determineHeader = true, const QString &header = QString(), bool global = false); diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index b26f51875d..64cbde13f7 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -93,41 +93,41 @@ struct WriteInitialization : public TreeWalker // // widgets // - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE; + void acceptLayout(DomLayout *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptLayoutItem(DomLayoutItem *node) override; // // actions // - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; - void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; + void acceptActionRef(DomActionRef *node) override; // // tab stops // - void acceptTabStops(DomTabStops *tabStops) Q_DECL_OVERRIDE; + void acceptTabStops(DomTabStops *tabStops) override; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; - void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; + void acceptCustomWidgets(DomCustomWidgets *node) override; + void acceptCustomWidget(DomCustomWidget *node) override; // // layout defaults/functions // - void acceptLayoutDefault(DomLayoutDefault *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutDefault(node); } - void acceptLayoutFunction(DomLayoutFunction *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutFunction(node); } + void acceptLayoutDefault(DomLayoutDefault *node) override { m_LayoutDefaultHandler.acceptLayoutDefault(node); } + void acceptLayoutFunction(DomLayoutFunction *node) override { m_LayoutDefaultHandler.acceptLayoutFunction(node); } // // signal/slot connections // - void acceptConnection(DomConnection *connection) Q_DECL_OVERRIDE; + void acceptConnection(DomConnection *connection) override; enum { Use43UiFile = 0, 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(); } diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h index c313681278..bebf139c5a 100644 --- a/src/tools/uic/databaseinfo.h +++ b/src/tools/uic/databaseinfo.h @@ -42,8 +42,8 @@ class DatabaseInfo : public TreeWalker public: DatabaseInfo(); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; inline QStringList connections() const { return m_connections; } diff --git a/src/tools/uic/validator.h b/src/tools/uic/validator.h index e0a99b47ef..f7f7401991 100644 --- a/src/tools/uic/validator.h +++ b/src/tools/uic/validator.h @@ -43,14 +43,14 @@ struct Validator : public TreeWalker { Validator(Uic *uic); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; - void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; + void acceptLayoutItem(DomLayoutItem *node) override; + void acceptLayout(DomLayout *node) override; - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; private: Driver *m_driver; -- cgit v1.2.3