feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2014-09-24 12:49:32 +02:00
parent 652c53bf06
commit 48f19e925b
100 changed files with 985 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmljseditor/qmljsquickfixassist.h
View File

@@ -38,7 +38,6 @@
#include <texteditor/codeassist/quickfixassistprovider.h>
#include <texteditor/codeassist/quickfixassistprocessor.h>
#include <utils/qtcoverride.h>
namespace QmlJSEditor {
namespace Internal {
@@ -64,7 +63,7 @@ public:
QmlJSQuickFixProcessor(const TextEditor::IAssistProvider *provider);
~QmlJSQuickFixProcessor();
const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
const TextEditor::IAssistProvider *provider() const Q_DECL_OVERRIDE;
private:
const TextEditor::IAssistProvider *m_provider;
@@ -77,11 +76,11 @@ public:
QmlJSQuickFixAssistProvider();
~QmlJSQuickFixAssistProvider();
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