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

3
src/plugins/cpptools/builtineditordocumentparser.h
View File

@@ -35,7 +35,6 @@
#include "cppmodelmanager.h"
#include <cplusplus/CppDocument.h>
#include <utils/qtcoverride.h>
#include <QMutex>
#include <QString>
@@ -49,7 +48,7 @@ class CPPTOOLS_EXPORT BuiltinEditorDocumentParser : public BaseEditorDocumentPar
public:
BuiltinEditorDocumentParser(const QString &filePath);
void update(WorkingCopy workingCopy) QTC_OVERRIDE;
void update(WorkingCopy workingCopy) Q_DECL_OVERRIDE;
void releaseResources();
CPlusPlus::Document::Ptr document() const;

11
src/plugins/cpptools/builtineditordocumentprocessor.h
View File

@@ -36,7 +36,6 @@
#include "cpptools_global.h"
#include "semantichighlighter.h"
#include <utils/qtcoverride.h>
namespace CppTools {
@@ -51,11 +50,11 @@ public:
~BuiltinEditorDocumentProcessor();
// BaseEditorDocumentProcessor interface
void run() QTC_OVERRIDE;
void semanticRehighlight(bool force) QTC_OVERRIDE;
CppTools::SemanticInfo recalculateSemanticInfo() QTC_OVERRIDE;
BaseEditorDocumentParser *parser() QTC_OVERRIDE;
bool isParserRunning() const QTC_OVERRIDE;
void run() Q_DECL_OVERRIDE;
void semanticRehighlight(bool force) Q_DECL_OVERRIDE;
CppTools::SemanticInfo recalculateSemanticInfo() Q_DECL_OVERRIDE;
BaseEditorDocumentParser *parser() Q_DECL_OVERRIDE;
bool isParserRunning() const Q_DECL_OVERRIDE;
private:
void onParserFinished(CPlusPlus::Document::Ptr document, CPlusPlus::Snapshot snapshot);

5
src/plugins/cpptools/cppclassesfilter.h
View File

@@ -34,7 +34,6 @@
#include "cpplocatordata.h"
#include "cpplocatorfilter.h"
#include <utils/qtcoverride.h>
namespace CppTools {
@@ -48,8 +47,8 @@ public:
~CppClassesFilter();
protected:
IndexItem::ItemType matchTypes() const QTC_OVERRIDE { return IndexItem::Class; }
Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) QTC_OVERRIDE;
IndexItem::ItemType matchTypes() const Q_DECL_OVERRIDE { return IndexItem::Class; }
Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) Q_DECL_OVERRIDE;
};
} // namespace CppTools

17
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -49,7 +49,6 @@
#include <texteditor/completionsettings.h>
#include <utils/qtcassert.h>
#include <utils/qtcoverride.h>
#include <cplusplus/BackwardsScanner.h>
#include <cplusplus/CppRewriter.h>
@@ -90,8 +89,8 @@ public:
CppAssistProposalItem() :
m_isOverloaded(false) {}
bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const QTC_OVERRIDE;
bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE;
void applyContextualContent(BaseTextEditorWidget *editorWidget, int basePosition) const Q_DECL_OVERRIDE;
bool isOverloaded() const { return m_isOverloaded; }
void markAsOverloaded() { m_isOverloaded = true; }
@@ -350,10 +349,10 @@ public:
, m_typeOfExpression(typeOfExp)
{}
void reset() QTC_OVERRIDE {}
int size() const QTC_OVERRIDE { return m_functionSymbols.size(); }
QString text(int index) const QTC_OVERRIDE;
int activeArgument(const QString &prefix) const QTC_OVERRIDE;
void reset() Q_DECL_OVERRIDE {}
int size() const Q_DECL_OVERRIDE { return m_functionSymbols.size(); }
QString text(int index) const Q_DECL_OVERRIDE;
int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE;
private:
QList<Function *> m_functionSymbols;
@@ -439,8 +438,8 @@ public:
, m_replaceDotForArrow(static_cast<CppAssistProposalModel *>(model)->m_replaceDotForArrow)
{}
bool isCorrective() const QTC_OVERRIDE { return m_replaceDotForArrow; }
void makeCorrection(BaseTextEditorWidget *editorWidget) QTC_OVERRIDE;
bool isCorrective() const Q_DECL_OVERRIDE { return m_replaceDotForArrow; }
void makeCorrection(BaseTextEditorWidget *editorWidget) Q_DECL_OVERRIDE;
private:
bool m_replaceDotForArrow;

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

9
src/plugins/cpptools/cppcompletionassistprovider.h
View File

@@ -35,7 +35,6 @@
#include <texteditor/codeassist/assistenums.h>
#include <texteditor/codeassist/completionassistprovider.h>
#include <utils/qtcoverride.h>
QT_BEGIN_NAMESPACE
class QTextDocument;
@@ -53,10 +52,10 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio
Q_OBJECT
public:
bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
int activationCharSequenceLength() const QTC_OVERRIDE;
bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
bool isContinuationChar(const QChar &c) const QTC_OVERRIDE;
bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
int activationCharSequenceLength() const Q_DECL_OVERRIDE;
bool isActivationCharSequence(const QString &sequence) const Q_DECL_OVERRIDE;
bool isContinuationChar(const QChar &c) const Q_DECL_OVERRIDE;
virtual TextEditor::AssistInterface *createAssistInterface(
const QString &filePath,

5
src/plugins/cpptools/cppfunctionsfilter.h
View File

@@ -33,7 +33,6 @@
#include "cpplocatordata.h"
#include "cpplocatorfilter.h"
#include <utils/qtcoverride.h>
namespace CppTools {
namespace Internal {
@@ -47,8 +46,8 @@ public:
~CppFunctionsFilter();
protected:
IndexItem::ItemType matchTypes() const QTC_OVERRIDE { return IndexItem::Function; }
Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) QTC_OVERRIDE;
IndexItem::ItemType matchTypes() const Q_DECL_OVERRIDE { return IndexItem::Function; }
Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) Q_DECL_OVERRIDE;
};
} // namespace Internal

1
src/plugins/cpptools/cppsemanticinfoupdater.cpp
View File

@@ -32,7 +32,6 @@
#include "cpplocalsymbols.h"
#include <utils/qtcassert.h>
#include <utils/qtcoverride.h>
#include <utils/runextensions.h>
#include <cplusplus/Control.h>

21
src/plugins/cpptools/cppsourceprocessor.h
View File

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