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

cpptools: s/Q_DECL_OVERRIDE/override/g

Browse Source 
Change-Id: I1b239a666b6605035e0f9c140d940e8c260bafd3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-03 15:32:42 +02:00
parent 314d4ce41f
commit e5da3d8aeb
8 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,7 +49,7 @@ class CPPTOOLS_EXPORT BuiltinEditorDocumentParser : public BaseEditorDocumentPar
public: public:
BuiltinEditorDocumentParser(const QString &filePath); BuiltinEditorDocumentParser(const QString &filePath);
void update(WorkingCopy workingCopy) Q_DECL_OVERRIDE; void update(WorkingCopy workingCopy) override;
void releaseResources(); void releaseResources();
CPlusPlus::Document::Ptr document() const; CPlusPlus::Document::Ptr document() const;

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

@@ -50,12 +50,12 @@ public:
~BuiltinEditorDocumentProcessor(); ~BuiltinEditorDocumentProcessor();
// BaseEditorDocumentProcessor interface // BaseEditorDocumentProcessor interface
void run() Q_DECL_OVERRIDE; void run() override;
void semanticRehighlight(bool force) Q_DECL_OVERRIDE; void semanticRehighlight(bool force) override;
CppTools::SemanticInfo recalculateSemanticInfo() Q_DECL_OVERRIDE; CppTools::SemanticInfo recalculateSemanticInfo() override;
BaseEditorDocumentParser *parser() Q_DECL_OVERRIDE; BaseEditorDocumentParser *parser() override;
CPlusPlus::Snapshot snapshot() Q_DECL_OVERRIDE; CPlusPlus::Snapshot snapshot() override;
bool isParserRunning() const Q_DECL_OVERRIDE; bool isParserRunning() const override;
private: private:
void onParserFinished(CPlusPlus::Document::Ptr document, CPlusPlus::Snapshot snapshot); void onParserFinished(CPlusPlus::Document::Ptr document, CPlusPlus::Snapshot snapshot);

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

@@ -48,8 +48,8 @@ public:
~CppClassesFilter(); ~CppClassesFilter();
protected: protected:
IndexItem::ItemType matchTypes() const Q_DECL_OVERRIDE { return IndexItem::Class; } IndexItem::ItemType matchTypes() const override { return IndexItem::Class; }
Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) Q_DECL_OVERRIDE; Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) override;
}; };
} // namespace CppTools } // namespace CppTools

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

@@ -91,8 +91,8 @@ public:
CppAssistProposalItem() : CppAssistProposalItem() :
m_isOverloaded(false) {} m_isOverloaded(false) {}
bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE; bool prematurelyApplies(const QChar &c) const override;
void applyContextualContent(TextEditorWidget *editorWidget, int basePosition) const Q_DECL_OVERRIDE; void applyContextualContent(TextEditorWidget *editorWidget, int basePosition) const override;
bool isOverloaded() const { return m_isOverloaded; } bool isOverloaded() const { return m_isOverloaded; }
void markAsOverloaded() { m_isOverloaded = true; } void markAsOverloaded() { m_isOverloaded = true; }
@@ -351,10 +351,10 @@ public:
, m_typeOfExpression(typeOfExp) , m_typeOfExpression(typeOfExp)
{} {}
void reset() Q_DECL_OVERRIDE {} void reset() override {}
int size() const Q_DECL_OVERRIDE { return m_functionSymbols.size(); } int size() const override { return m_functionSymbols.size(); }
QString text(int index) const Q_DECL_OVERRIDE; QString text(int index) const override;
int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE; int activeArgument(const QString &prefix) const override;
private: private:
QList<Function *> m_functionSymbols; QList<Function *> m_functionSymbols;
@@ -439,8 +439,8 @@ public:
, m_replaceDotForArrow(static_cast<CppAssistProposalModel *>(model)->m_replaceDotForArrow) , m_replaceDotForArrow(static_cast<CppAssistProposalModel *>(model)->m_replaceDotForArrow)
{} {}
bool isCorrective() const Q_DECL_OVERRIDE { return m_replaceDotForArrow; } bool isCorrective() const override { return m_replaceDotForArrow; }
void makeCorrection(TextEditorWidget *editorWidget) Q_DECL_OVERRIDE; void makeCorrection(TextEditorWidget *editorWidget) override;
private: private:
bool m_replaceDotForArrow; bool m_replaceDotForArrow;

10
src/plugins/cpptools/cppcompletionassist.h
View File

@@ -74,8 +74,8 @@ public:
m_typeOfExpression->setExpandTemplates(true); m_typeOfExpression->setExpandTemplates(true);
} }
bool isSortable(const QString &prefix) const Q_DECL_OVERRIDE; bool isSortable(const QString &prefix) const override;
TextEditor::AssistProposalItem *proposalItem(int index) const Q_DECL_OVERRIDE; TextEditor::AssistProposalItem *proposalItem(int index) const override;
unsigned m_completionOperator; unsigned m_completionOperator;
bool m_replaceDotForArrow; bool m_replaceDotForArrow;
@@ -87,14 +87,14 @@ class InternalCompletionAssistProvider : public CppCompletionAssistProvider
Q_OBJECT Q_OBJECT
public: public:
TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE; TextEditor::IAssistProcessor *createProcessor() const override;
TextEditor::AssistInterface *createAssistInterface( TextEditor::AssistInterface *createAssistInterface(
const QString &filePath, const QString &filePath,
QTextDocument *document, QTextDocument *document,
const CPlusPlus::LanguageFeatures &languageFeatures, const CPlusPlus::LanguageFeatures &languageFeatures,
int position, int position,
TextEditor::AssistReason reason) const Q_DECL_OVERRIDE; TextEditor::AssistReason reason) const override;
}; };
class InternalCppCompletionAssistProcessor : public CppCompletionAssistProcessor class InternalCppCompletionAssistProcessor : public CppCompletionAssistProcessor
@@ -103,7 +103,7 @@ public:
InternalCppCompletionAssistProcessor(); InternalCppCompletionAssistProcessor();
~InternalCppCompletionAssistProcessor(); ~InternalCppCompletionAssistProcessor();
TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE; TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override;
private: private:
TextEditor::IAssistProposal *createContentProposal(); TextEditor::IAssistProposal *createContentProposal();

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

@@ -54,10 +54,10 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio
Q_OBJECT Q_OBJECT
public: public:
bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE; bool supportsEditor(Core::Id editorId) const override;
int activationCharSequenceLength() const Q_DECL_OVERRIDE; int activationCharSequenceLength() const override;
bool isActivationCharSequence(const QString &sequence) const Q_DECL_OVERRIDE; bool isActivationCharSequence(const QString &sequence) const override;
bool isContinuationChar(const QChar &c) const Q_DECL_OVERRIDE; bool isContinuationChar(const QChar &c) const override;
virtual TextEditor::AssistInterface *createAssistInterface( virtual TextEditor::AssistInterface *createAssistInterface(
const QString &filePath, const QString &filePath,

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

@@ -47,8 +47,8 @@ public:
~CppFunctionsFilter(); ~CppFunctionsFilter();
protected: protected:
IndexItem::ItemType matchTypes() const Q_DECL_OVERRIDE { return IndexItem::Function; } IndexItem::ItemType matchTypes() const override { return IndexItem::Function; }
Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) Q_DECL_OVERRIDE; Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) override;
}; };
} // namespace Internal } // namespace Internal

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

@@ -93,22 +93,22 @@ private:
void mergeEnvironment(CPlusPlus::Document::Ptr doc); void mergeEnvironment(CPlusPlus::Document::Ptr doc);
// Client interface // Client interface
void macroAdded(const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE; void macroAdded(const CPlusPlus::Macro &macro) override;
void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset,
unsigned line, const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE; unsigned line, const CPlusPlus::Macro &macro) override;
void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset, void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset,
const CPlusPlus::ByteArrayRef &name) Q_DECL_OVERRIDE; const CPlusPlus::ByteArrayRef &name) override;
void notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset, void notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset,
unsigned line, const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE; unsigned line, const CPlusPlus::Macro &macro) override;
void startExpandingMacro(unsigned bytesOffset, unsigned utf16charOffset, void startExpandingMacro(unsigned bytesOffset, unsigned utf16charOffset,
unsigned line, const CPlusPlus::Macro &macro, unsigned line, const CPlusPlus::Macro &macro,
const QVector<CPlusPlus::MacroArgumentReference> &actuals) Q_DECL_OVERRIDE; const QVector<CPlusPlus::MacroArgumentReference> &actuals) override;
void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro &macro) Q_DECL_OVERRIDE; void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro &macro) override;
void markAsIncludeGuard(const QByteArray &macroName) Q_DECL_OVERRIDE; void markAsIncludeGuard(const QByteArray &macroName) override;
void startSkippingBlocks(unsigned utf16charsOffset) Q_DECL_OVERRIDE; void startSkippingBlocks(unsigned utf16charsOffset) override;
void stopSkippingBlocks(unsigned utf16charsOffset) Q_DECL_OVERRIDE; void stopSkippingBlocks(unsigned utf16charsOffset) override;
void sourceNeeded(unsigned line, const QString &fileName, IncludeType type, void sourceNeeded(unsigned line, const QString &fileName, IncludeType type,
const QStringList &initialIncludes) Q_DECL_OVERRIDE; const QStringList &initialIncludes) override;
private: private:
CPlusPlus::Snapshot m_snapshot; CPlusPlus::Snapshot m_snapshot;