diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-24 12:49:32 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-09-25 12:16:47 +0200 |
| commit | 48f19e925b9af6fb0b22c8bd6c34a4778fe280a8 (patch) | |
| tree | b929e23cd0487100fa7f21234400b616231e4143 /src/plugins/cppeditor/cppquickfixassistant.h | |
| parent | 652c53bf06826bc347d5384b3da01c8a083b2118 (diff) | |
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>
Diffstat (limited to 'src/plugins/cppeditor/cppquickfixassistant.h')
| -rw-r--r-- | src/plugins/cppeditor/cppquickfixassistant.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/cppquickfixassistant.h index 3f61f41f49..d362c3fbde 100644 --- a/src/plugins/cppeditor/cppquickfixassistant.h +++ b/src/plugins/cppeditor/cppquickfixassistant.h @@ -37,7 +37,6 @@ #include <cplusplus/LookupContext.h> -#include <utils/qtcoverride.h> namespace CppTools { class CppRefactoringFile; @@ -79,7 +78,7 @@ class CppQuickFixAssistProcessor : public TextEditor::QuickFixAssistProcessor public: CppQuickFixAssistProcessor(const TextEditor::IAssistProvider *provider); - const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE; + const TextEditor::IAssistProvider *provider() const Q_DECL_OVERRIDE; private: const TextEditor::IAssistProvider *m_provider; @@ -88,11 +87,11 @@ private: class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider { public: - bool isAsynchronous() const QTC_OVERRIDE; - bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE; - TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE; + bool isAsynchronous() const Q_DECL_OVERRIDE; + bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE; + TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE; - QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE; + QList<TextEditor::QuickFixFactory *> quickFixFactories() const Q_DECL_OVERRIDE; }; } // Internal |