Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE

This patch removes src/libs/utils/qtcoverride.h
and uses Q_DECL_OVERRIDE from Qt 5 instead.

Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

11 files changed, 32 insertions, 43 deletions

diff --git a/src/plugins/beautifier/artisticstyle/artisticstyle.h b/src/plugins/beautifier/artisticstyle/artisticstyle.h
index 4217172fd4..abda7807d4 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyle.h
+++ b/src/plugins/beautifier/artisticstyle/artisticstyle.h
@@ -32,7 +32,6 @@
 
 #include "../beautifierabstracttool.h"
 
-#include <utils/qtcoverride.h>
 
 QT_FORWARD_DECLARE_CLASS(QAction)
 
@@ -52,9 +51,9 @@ class ArtisticStyle : public BeautifierAbstractTool
 public:
     explicit ArtisticStyle(BeautifierPlugin *parent = 0);
     virtual ~ArtisticStyle();
-    bool initialize() QTC_OVERRIDE;
-    void updateActions(Core::IEditor *editor) QTC_OVERRIDE;
-    QList<QObject *> autoReleaseObjects() QTC_OVERRIDE;
+    bool initialize() Q_DECL_OVERRIDE;
+    void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE;
+    QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE;
 
 private slots:
     void formatFile();
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h
index 95ee9be84d..24c5264957 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h
+++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h
@@ -31,7 +31,6 @@
 #define BEAUTIFIER_ARTISTICSTYLEOPTIONSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
 
 #include <QPointer>
 #include <QWidget>
@@ -65,9 +64,9 @@ class ArtisticStyleOptionsPage : public Core::IOptionsPage
 
 public:
     explicit ArtisticStyleOptionsPage(ArtisticStyleSettings *settings, QObject *parent = 0);
-    QWidget *widget() QTC_OVERRIDE;
-    void apply() QTC_OVERRIDE;
-    void finish() QTC_OVERRIDE;
+    QWidget *widget() Q_DECL_OVERRIDE;
+    void apply() Q_DECL_OVERRIDE;
+    void finish() Q_DECL_OVERRIDE;
 
 private:
     QPointer<ArtisticStyleOptionsPageWidget> m_widget;
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
index bd6b6fbf21..594128dd9b 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
+++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.h
@@ -32,7 +32,6 @@
 
 #include "../abstractsettings.h"
 
-#include <utils/qtcoverride.h>
 
 #include <QFuture>
 #include <QFutureWatcher>
@@ -52,7 +51,7 @@ public:
 
     ArtisticStyleSettings();
 
-    void updateVersion() QTC_OVERRIDE;
+    void updateVersion() Q_DECL_OVERRIDE;
 
     bool useOtherFiles() const;
     void setUseOtherFiles(bool useOtherFiles);
@@ -66,8 +65,8 @@ public:
     QString customStyle() const;
     void setCustomStyle(const QString &customStyle);
 
-    QString documentationFilePath() const QTC_OVERRIDE;
-    void createDocumentationFile() const QTC_OVERRIDE;
+    QString documentationFilePath() const Q_DECL_OVERRIDE;
+    void createDocumentationFile() const Q_DECL_OVERRIDE;
 
 private slots:
     void helperSetVersion();
diff --git a/src/plugins/beautifier/beautifierplugin.h b/src/plugins/beautifier/beautifierplugin.h
index fb241ebd68..cfbaf69869 100644
--- a/src/plugins/beautifier/beautifierplugin.h
+++ b/src/plugins/beautifier/beautifierplugin.h
@@ -33,7 +33,6 @@
 #include "command.h"
 
 #include <extensionsystem/iplugin.h>
-#include <utils/qtcoverride.h>
 
 #include <QFutureInterface>
 #include <QPlainTextEdit>
@@ -73,9 +72,9 @@ class BeautifierPlugin : public ExtensionSystem::IPlugin
 public:
     BeautifierPlugin();
     ~BeautifierPlugin();
-    bool initialize(const QStringList &arguments, QString *errorString) QTC_OVERRIDE;
-    void extensionsInitialized() QTC_OVERRIDE;
-    ShutdownFlag aboutToShutdown() QTC_OVERRIDE;
+    bool initialize(const QStringList &arguments, QString *errorString) Q_DECL_OVERRIDE;
+    void extensionsInitialized() Q_DECL_OVERRIDE;
+    ShutdownFlag aboutToShutdown() Q_DECL_OVERRIDE;
 
     QString format(const QString &text, const Command &command, const QString &fileName,
                    bool *timeout = 0);
diff --git a/src/plugins/beautifier/clangformat/clangformat.h b/src/plugins/beautifier/clangformat/clangformat.h
index e92d52cfdd..cb646c77b2 100644
--- a/src/plugins/beautifier/clangformat/clangformat.h
+++ b/src/plugins/beautifier/clangformat/clangformat.h
@@ -33,7 +33,6 @@
 #include "../beautifierabstracttool.h"
 #include "../command.h"
 
-#include <utils/qtcoverride.h>
 
 QT_FORWARD_DECLARE_CLASS(QAction)
 
@@ -53,9 +52,9 @@ class ClangFormat : public BeautifierAbstractTool
 public:
     explicit ClangFormat(BeautifierPlugin *parent = 0);
     virtual ~ClangFormat();
-    bool initialize() QTC_OVERRIDE;
-    void updateActions(Core::IEditor *editor) QTC_OVERRIDE;
-    QList<QObject *> autoReleaseObjects() QTC_OVERRIDE;
+    bool initialize() Q_DECL_OVERRIDE;
+    void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE;
+    QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE;
 
 private slots:
     void formatFile();
diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.h b/src/plugins/beautifier/clangformat/clangformatoptionspage.h
index 25c0001d76..9e45ae8ff8 100644
--- a/src/plugins/beautifier/clangformat/clangformatoptionspage.h
+++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.h
@@ -31,7 +31,6 @@
 #define BEAUTIFIER_CLANGFORMATOPTIONSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
 
 #include <QPointer>
 #include <QWidget>
@@ -65,9 +64,9 @@ class ClangFormatOptionsPage : public Core::IOptionsPage
 
 public:
     explicit ClangFormatOptionsPage(ClangFormatSettings *settings, QObject *parent = 0);
-    QWidget *widget() QTC_OVERRIDE;
-    void apply() QTC_OVERRIDE;
-    void finish() QTC_OVERRIDE;
+    QWidget *widget() Q_DECL_OVERRIDE;
+    void apply() Q_DECL_OVERRIDE;
+    void finish() Q_DECL_OVERRIDE;
 
 private:
     QPointer<ClangFormatOptionsPageWidget> m_widget;
diff --git a/src/plugins/beautifier/clangformat/clangformatsettings.h b/src/plugins/beautifier/clangformat/clangformatsettings.h
index 39931d131c..a2004855be 100644
--- a/src/plugins/beautifier/clangformat/clangformatsettings.h
+++ b/src/plugins/beautifier/clangformat/clangformatsettings.h
@@ -32,7 +32,6 @@
 
 #include "../abstractsettings.h"
 
-#include <utils/qtcoverride.h>
 
 namespace Beautifier {
 namespace Internal {
@@ -45,9 +44,9 @@ class ClangFormatSettings : public AbstractSettings
 public:
     explicit ClangFormatSettings();
 
-    QString documentationFilePath() const QTC_OVERRIDE;
-    void createDocumentationFile() const QTC_OVERRIDE;
-    QStringList completerWords() QTC_OVERRIDE;
+    QString documentationFilePath() const Q_DECL_OVERRIDE;
+    void createDocumentationFile() const Q_DECL_OVERRIDE;
+    QStringList completerWords() Q_DECL_OVERRIDE;
 
     bool usePredefinedStyle() const;
     void setUsePredefinedStyle(bool usePredefinedStyle);
diff --git a/src/plugins/beautifier/configurationeditor.h b/src/plugins/beautifier/configurationeditor.h
index 4319fd6653..0638621955 100644
--- a/src/plugins/beautifier/configurationeditor.h
+++ b/src/plugins/beautifier/configurationeditor.h
@@ -30,7 +30,6 @@
 #ifndef BEAUTIFIER_CONFIGURATIONEDITOR_H
 #define BEAUTIFIER_CONFIGURATIONEDITOR_H
 
-#include <utils/qtcoverride.h>
 
 #include <QPlainTextEdit>
 #include <QRegExp>
@@ -61,7 +60,7 @@ public:
     void setCommentExpression(const QRegExp &rx);
 
 protected:
-    void highlightBlock(const QString &text) QTC_OVERRIDE;
+    void highlightBlock(const QString &text) Q_DECL_OVERRIDE;
 
 private:
     QRegExp m_expressionKeyword;
@@ -80,8 +79,8 @@ public:
     void setCommentExpression(const QRegExp &rx);
 
 protected:
-    bool eventFilter(QObject *object, QEvent *event) QTC_OVERRIDE;
-    void keyPressEvent(QKeyEvent *event) QTC_OVERRIDE;
+    bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE;
+    void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
 
 private slots:
     void insertCompleterText(const QString &text);
diff --git a/src/plugins/beautifier/uncrustify/uncrustify.h b/src/plugins/beautifier/uncrustify/uncrustify.h
index 93dba09d27..d798431111 100644
--- a/src/plugins/beautifier/uncrustify/uncrustify.h
+++ b/src/plugins/beautifier/uncrustify/uncrustify.h
@@ -32,7 +32,6 @@
 
 #include "../beautifierabstracttool.h"
 
-#include <utils/qtcoverride.h>
 
 QT_FORWARD_DECLARE_CLASS(QAction)
 
@@ -52,9 +51,9 @@ class Uncrustify : public BeautifierAbstractTool
 public:
     explicit Uncrustify(BeautifierPlugin *parent = 0);
     virtual ~Uncrustify();
-    bool initialize() QTC_OVERRIDE;
-    void updateActions(Core::IEditor *editor) QTC_OVERRIDE;
-    QList<QObject *> autoReleaseObjects() QTC_OVERRIDE;
+    bool initialize() Q_DECL_OVERRIDE;
+    void updateActions(Core::IEditor *editor) Q_DECL_OVERRIDE;
+    QList<QObject *> autoReleaseObjects() Q_DECL_OVERRIDE;
 
 private slots:
     void formatFile();
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h
index e552ce9a72..e57c44ab18 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h
+++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h
@@ -31,7 +31,6 @@
 #define BEAUTIFIER_UNCRUSTIFYOPTIONSPAGE_H
 
 #include <coreplugin/dialogs/ioptionspage.h>
-#include <utils/qtcoverride.h>
 
 #include <QPointer>
 #include <QWidget>
@@ -65,9 +64,9 @@ class UncrustifyOptionsPage : public Core::IOptionsPage
 
 public:
     explicit UncrustifyOptionsPage(UncrustifySettings *settings, QObject *parent = 0);
-    QWidget *widget() QTC_OVERRIDE;
-    void apply() QTC_OVERRIDE;
-    void finish() QTC_OVERRIDE;
+    QWidget *widget() Q_DECL_OVERRIDE;
+    void apply() Q_DECL_OVERRIDE;
+    void finish() Q_DECL_OVERRIDE;
 
 private:
     QPointer<UncrustifyOptionsPageWidget> m_widget;
diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.h b/src/plugins/beautifier/uncrustify/uncrustifysettings.h
index 3398a64e1a..c6947b3d62 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifysettings.h
+++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.h
@@ -32,7 +32,6 @@
 
 #include "../abstractsettings.h"
 
-#include <utils/qtcoverride.h>
 
 namespace Beautifier {
 namespace Internal {
@@ -55,8 +54,8 @@ public:
     QString customStyle() const;
     void setCustomStyle(const QString &customStyle);
 
-    QString documentationFilePath() const QTC_OVERRIDE;
-    void createDocumentationFile() const QTC_OVERRIDE;
+    QString documentationFilePath() const Q_DECL_OVERRIDE;
+    void createDocumentationFile() const Q_DECL_OVERRIDE;
 };
 
 } // namespace Uncrustify