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/cpptools/cppcompletionassist.h
View File

@@ -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();