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>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h
index 5254acd7ef..a03405987b 100644
--- a/src/plugins/cpptools/cppcompletionassist.h
+++ b/src/plugins/cpptools/cppcompletionassist.h
@@ -44,7 +44,6 @@
 #include <texteditor/codeassist/iassistprocessor.h>
 #include <texteditor/snippets/snippetassistcollector.h>
 
-#include <utils/qtcoverride.h>
 
 #include <QStringList>
 #include <QVariant>
@@ -73,8 +72,8 @@ public:
         m_typeOfExpression->setExpandTemplates(true);
     }
 
-    bool isSortable(const QString &prefix) const QTC_OVERRIDE;
-    TextEditor::AssistProposalItem *proposalItem(int index) const QTC_OVERRIDE;
+    bool isSortable(const QString &prefix) const Q_DECL_OVERRIDE;
+    TextEditor::AssistProposalItem *proposalItem(int index) const Q_DECL_OVERRIDE;
 
     unsigned m_completionOperator;
     bool m_replaceDotForArrow;
@@ -86,14 +85,14 @@ class InternalCompletionAssistProvider : public CppCompletionAssistProvider
     Q_OBJECT
 
 public:
-    TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
+    TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
 
     TextEditor::AssistInterface *createAssistInterface(
             const QString &filePath,
             QTextDocument *document,
             bool isObjCEnabled,
             int position,
-            TextEditor::AssistReason reason) const QTC_OVERRIDE;
+            TextEditor::AssistReason reason) const Q_DECL_OVERRIDE;
 };
 
 class CppCompletionAssistProcessor : public TextEditor::IAssistProcessor
@@ -102,7 +101,7 @@ public:
     CppCompletionAssistProcessor();
     ~CppCompletionAssistProcessor();
 
-    TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) QTC_OVERRIDE;
+    TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE;
 
 private:
     TextEditor::IAssistProposal *createContentProposal();