From 48f19e925b9af6fb0b22c8bd6c34a4778fe280a8 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
Date: Wed, 24 Sep 2014 12:49:32 +0200
Subject: 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>
---
 src/plugins/cpptools/cppsourceprocessor.h | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/plugins/cpptools/cppsourceprocessor.h')

diff --git a/src/plugins/cpptools/cppsourceprocessor.h b/src/plugins/cpptools/cppsourceprocessor.h
index 1843a8894d..e0a03d4bdf 100644
--- a/src/plugins/cpptools/cppsourceprocessor.h
+++ b/src/plugins/cpptools/cppsourceprocessor.h
@@ -35,7 +35,6 @@
 
 #include <cplusplus/PreprocessorEnvironment.h>
 #include <cplusplus/pp-engine.h>
-#include <utils/qtcoverride.h>
 
 #include <QHash>
 #include <QPointer>
@@ -96,22 +95,22 @@ private:
     void mergeEnvironment(CPlusPlus::Document::Ptr doc);
 
     // Client interface
-    void macroAdded(const CPlusPlus::Macro &macro) QTC_OVERRIDE;
+    void macroAdded(const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE;
     void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset,
-                                    unsigned line, const CPlusPlus::Macro &macro) QTC_OVERRIDE;
+                                    unsigned line, const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE;
     void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset,
-                                    const CPlusPlus::ByteArrayRef &name) QTC_OVERRIDE;
+                                    const CPlusPlus::ByteArrayRef &name) Q_DECL_OVERRIDE;
     void notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset,
-                              unsigned line, const CPlusPlus::Macro &macro) QTC_OVERRIDE;
+                              unsigned line, const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE;
     void startExpandingMacro(unsigned bytesOffset, unsigned utf16charOffset,
                              unsigned line, const CPlusPlus::Macro &macro,
-                             const QVector<CPlusPlus::MacroArgumentReference> &actuals) QTC_OVERRIDE;
-    void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro &macro) QTC_OVERRIDE;
-    void markAsIncludeGuard(const QByteArray &macroName) QTC_OVERRIDE;
-    void startSkippingBlocks(unsigned utf16charsOffset) QTC_OVERRIDE;
-    void stopSkippingBlocks(unsigned utf16charsOffset) QTC_OVERRIDE;
+                             const QVector<CPlusPlus::MacroArgumentReference> &actuals) Q_DECL_OVERRIDE;
+    void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE;
+    void markAsIncludeGuard(const QByteArray &macroName) Q_DECL_OVERRIDE;
+    void startSkippingBlocks(unsigned utf16charsOffset) Q_DECL_OVERRIDE;
+    void stopSkippingBlocks(unsigned utf16charsOffset) Q_DECL_OVERRIDE;
     void sourceNeeded(unsigned line, const QString &fileName, IncludeType type,
-                      const QStringList &initialIncludes) QTC_OVERRIDE;
+                      const QStringList &initialIncludes) Q_DECL_OVERRIDE;
 
 private:
     CPlusPlus::Snapshot m_snapshot;
-- 
cgit v1.2.1