From 5180f32c5abe01acd65cde68c2c16aedda4028ec Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Sun, 16 Nov 2014 13:09:01 +0100 Subject: Add Q_DECL_OVERRIDE in the src subdirectory Done automatically with clang-modernize on linux (But does not add Q_DECL_OVERRIDE to the function that are marked as inline because it a compilation error with MSVC2010) Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171 Reviewed-by: Thiago Macieira --- src/tools/uic/cpp/cppextractimages.h | 6 ++--- src/tools/uic/cpp/cppwritedeclaration.h | 14 +++++------ src/tools/uic/cpp/cppwriteicondata.h | 6 ++--- src/tools/uic/cpp/cppwriteicondeclaration.h | 6 ++--- src/tools/uic/cpp/cppwriteiconinitialization.h | 6 ++--- src/tools/uic/cpp/cppwriteincludes.h | 20 ++++++++-------- src/tools/uic/cpp/cppwriteinitialization.h | 32 +++++++++++++------------- 7 files changed, 45 insertions(+), 45 deletions(-) (limited to 'src/tools/uic/cpp') diff --git a/src/tools/uic/cpp/cppextractimages.h b/src/tools/uic/cpp/cppextractimages.h index ce5fd75b5d..162359ca13 100644 --- a/src/tools/uic/cpp/cppextractimages.h +++ b/src/tools/uic/cpp/cppextractimages.h @@ -52,9 +52,9 @@ class ExtractImages : public TreeWalker public: ExtractImages(const Option &opt); - void acceptUI(DomUI *node); - void acceptImages(DomImages *images); - void acceptImage(DomImage *image); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptImages(DomImages *images) Q_DECL_OVERRIDE; + void acceptImage(DomImage *image) Q_DECL_OVERRIDE; private: QTextStream *m_output; diff --git a/src/tools/uic/cpp/cppwritedeclaration.h b/src/tools/uic/cpp/cppwritedeclaration.h index 7cd8b3581e..7ce7cd083c 100644 --- a/src/tools/uic/cpp/cppwritedeclaration.h +++ b/src/tools/uic/cpp/cppwritedeclaration.h @@ -50,13 +50,13 @@ struct WriteDeclaration : public TreeWalker { WriteDeclaration(Uic *uic, bool activateScripts); - void acceptUI(DomUI *node); - void acceptWidget(DomWidget *node); - void acceptSpacer(DomSpacer *node); - void acceptLayout(DomLayout *node); - void acceptActionGroup(DomActionGroup *node); - void acceptAction(DomAction *node); - void acceptButtonGroup(const DomButtonGroup *buttonGroup); + 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; private: Uic *m_uic; diff --git a/src/tools/uic/cpp/cppwriteicondata.h b/src/tools/uic/cpp/cppwriteicondata.h index 0dc2bf0721..613b7d7ca3 100644 --- a/src/tools/uic/cpp/cppwriteicondata.h +++ b/src/tools/uic/cpp/cppwriteicondata.h @@ -52,9 +52,9 @@ class WriteIconData : public TreeWalker public: WriteIconData(Uic *uic); - void acceptUI(DomUI *node); - void acceptImages(DomImages *images); - void acceptImage(DomImage *image); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptImages(DomImages *images) Q_DECL_OVERRIDE; + void acceptImage(DomImage *image) Q_DECL_OVERRIDE; static void writeImage(QTextStream &output, const QString &indent, bool limitXPM_LineLength, const DomImage *image); diff --git a/src/tools/uic/cpp/cppwriteicondeclaration.h b/src/tools/uic/cpp/cppwriteicondeclaration.h index c093430bec..f717208b59 100644 --- a/src/tools/uic/cpp/cppwriteicondeclaration.h +++ b/src/tools/uic/cpp/cppwriteicondeclaration.h @@ -51,9 +51,9 @@ class WriteIconDeclaration : public TreeWalker public: WriteIconDeclaration(Uic *uic); - void acceptUI(DomUI *node); - void acceptImages(DomImages *images); - void acceptImage(DomImage *image); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptImages(DomImages *images) Q_DECL_OVERRIDE; + void acceptImage(DomImage *image) Q_DECL_OVERRIDE; private: Driver *driver; diff --git a/src/tools/uic/cpp/cppwriteiconinitialization.h b/src/tools/uic/cpp/cppwriteiconinitialization.h index d8a0a6195f..53f7de6597 100644 --- a/src/tools/uic/cpp/cppwriteiconinitialization.h +++ b/src/tools/uic/cpp/cppwriteiconinitialization.h @@ -53,9 +53,9 @@ class WriteIconInitialization : public TreeWalker public: WriteIconInitialization(Uic *uic); - void acceptUI(DomUI *node); - void acceptImages(DomImages *images); - void acceptImage(DomImage *image); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptImages(DomImages *images) Q_DECL_OVERRIDE; + void acceptImage(DomImage *image) Q_DECL_OVERRIDE; static QString iconFromDataFunction(); diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h index 6f6a0f6105..0d446514f1 100644 --- a/src/tools/uic/cpp/cppwriteincludes.h +++ b/src/tools/uic/cpp/cppwriteincludes.h @@ -53,24 +53,24 @@ struct WriteIncludes : public TreeWalker { WriteIncludes(Uic *uic); - void acceptUI(DomUI *node); - void acceptWidget(DomWidget *node); - void acceptLayout(DomLayout *node); - void acceptSpacer(DomSpacer *node); - void acceptProperty(DomProperty *node); - void acceptWidgetScripts(const DomScripts &, DomWidget *, const DomWidgets &); + 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 acceptWidgetScripts(const DomScripts &, DomWidget *, const DomWidgets &) Q_DECL_OVERRIDE; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node); - void acceptCustomWidget(DomCustomWidget *node); + void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; + void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; // // include hints // - void acceptIncludes(DomIncludes *node); - void acceptInclude(DomInclude *node); + void acceptIncludes(DomIncludes *node) Q_DECL_OVERRIDE; + void acceptInclude(DomInclude *node) Q_DECL_OVERRIDE; bool scriptsActivated() const { return m_scriptsActivated; } diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index 1cf3e750b4..53bc57d376 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -110,47 +110,47 @@ struct WriteInitialization : public TreeWalker // // widgets // - void acceptUI(DomUI *node); - void acceptWidget(DomWidget *node); - void acceptWidgetScripts(const DomScripts &, DomWidget *node, const DomWidgets &childWidgets); + void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptWidgetScripts(const DomScripts &, DomWidget *node, const DomWidgets &childWidgets) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node); - void acceptSpacer(DomSpacer *node); - void acceptLayoutItem(DomLayoutItem *node); + void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; + void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; + void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE; // // actions // - void acceptActionGroup(DomActionGroup *node); - void acceptAction(DomAction *node); - void acceptActionRef(DomActionRef *node); + void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; + void acceptAction(DomAction *node) Q_DECL_OVERRIDE; + void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE; // // tab stops // - void acceptTabStops(DomTabStops *tabStops); + void acceptTabStops(DomTabStops *tabStops) Q_DECL_OVERRIDE; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node); - void acceptCustomWidget(DomCustomWidget *node); + void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; + void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; // // layout defaults/functions // - void acceptLayoutDefault(DomLayoutDefault *node) { m_LayoutDefaultHandler.acceptLayoutDefault(node); } - void acceptLayoutFunction(DomLayoutFunction *node) { m_LayoutDefaultHandler.acceptLayoutFunction(node); } + void acceptLayoutDefault(DomLayoutDefault *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutDefault(node); } + void acceptLayoutFunction(DomLayoutFunction *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutFunction(node); } // // signal/slot connections // - void acceptConnection(DomConnection *connection); + void acceptConnection(DomConnection *connection) Q_DECL_OVERRIDE; // // images // - void acceptImage(DomImage *image); + void acceptImage(DomImage *image) Q_DECL_OVERRIDE; enum { Use43UiFile = 0, -- cgit v1.2.3