From e5da3d8aeb6edf4eb4dc64831c29a7f8bab6e1de Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 3 Jun 2015 15:32:42 +0200 Subject: [PATCH] cpptools: s/Q_DECL_OVERRIDE/override/g Change-Id: I1b239a666b6605035e0f9c140d940e8c260bafd3 Reviewed-by: Nikolai Kosjar --- .../cpptools/builtineditordocumentparser.h | 2 +- .../cpptools/builtineditordocumentprocessor.h | 12 +++++------ src/plugins/cpptools/cppclassesfilter.h | 4 ++-- src/plugins/cpptools/cppcompletionassist.cpp | 16 +++++++-------- src/plugins/cpptools/cppcompletionassist.h | 10 +++++----- .../cpptools/cppcompletionassistprovider.h | 8 ++++---- src/plugins/cpptools/cppfunctionsfilter.h | 4 ++-- src/plugins/cpptools/cppsourceprocessor.h | 20 +++++++++---------- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/plugins/cpptools/builtineditordocumentparser.h b/src/plugins/cpptools/builtineditordocumentparser.h index 4d04118bacf..ebd8cc28fd5 100644 --- a/src/plugins/cpptools/builtineditordocumentparser.h +++ b/src/plugins/cpptools/builtineditordocumentparser.h @@ -49,7 +49,7 @@ class CPPTOOLS_EXPORT BuiltinEditorDocumentParser : public BaseEditorDocumentPar public: BuiltinEditorDocumentParser(const QString &filePath); - void update(WorkingCopy workingCopy) Q_DECL_OVERRIDE; + void update(WorkingCopy workingCopy) override; void releaseResources(); CPlusPlus::Document::Ptr document() const; diff --git a/src/plugins/cpptools/builtineditordocumentprocessor.h b/src/plugins/cpptools/builtineditordocumentprocessor.h index f1f70b15f0c..0b80f94c29e 100644 --- a/src/plugins/cpptools/builtineditordocumentprocessor.h +++ b/src/plugins/cpptools/builtineditordocumentprocessor.h @@ -50,12 +50,12 @@ public: ~BuiltinEditorDocumentProcessor(); // BaseEditorDocumentProcessor interface - void run() Q_DECL_OVERRIDE; - void semanticRehighlight(bool force) Q_DECL_OVERRIDE; - CppTools::SemanticInfo recalculateSemanticInfo() Q_DECL_OVERRIDE; - BaseEditorDocumentParser *parser() Q_DECL_OVERRIDE; - CPlusPlus::Snapshot snapshot() Q_DECL_OVERRIDE; - bool isParserRunning() const Q_DECL_OVERRIDE; + void run() override; + void semanticRehighlight(bool force) override; + CppTools::SemanticInfo recalculateSemanticInfo() override; + BaseEditorDocumentParser *parser() override; + CPlusPlus::Snapshot snapshot() override; + bool isParserRunning() const override; private: void onParserFinished(CPlusPlus::Document::Ptr document, CPlusPlus::Snapshot snapshot); diff --git a/src/plugins/cpptools/cppclassesfilter.h b/src/plugins/cpptools/cppclassesfilter.h index 8f63c3e2e17..1727f7073ad 100644 --- a/src/plugins/cpptools/cppclassesfilter.h +++ b/src/plugins/cpptools/cppclassesfilter.h @@ -48,8 +48,8 @@ public: ~CppClassesFilter(); protected: - IndexItem::ItemType matchTypes() const Q_DECL_OVERRIDE { return IndexItem::Class; } - Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) Q_DECL_OVERRIDE; + IndexItem::ItemType matchTypes() const override { return IndexItem::Class; } + Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) override; }; } // namespace CppTools diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp index 4872448c72c..c0cff994c2a 100644 --- a/src/plugins/cpptools/cppcompletionassist.cpp +++ b/src/plugins/cpptools/cppcompletionassist.cpp @@ -91,8 +91,8 @@ public: CppAssistProposalItem() : m_isOverloaded(false) {} - bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE; - void applyContextualContent(TextEditorWidget *editorWidget, int basePosition) const Q_DECL_OVERRIDE; + bool prematurelyApplies(const QChar &c) const override; + void applyContextualContent(TextEditorWidget *editorWidget, int basePosition) const override; bool isOverloaded() const { return m_isOverloaded; } void markAsOverloaded() { m_isOverloaded = true; } @@ -351,10 +351,10 @@ public: , m_typeOfExpression(typeOfExp) {} - 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; + void reset() override {} + int size() const override { return m_functionSymbols.size(); } + QString text(int index) const override; + int activeArgument(const QString &prefix) const override; private: QList m_functionSymbols; @@ -439,8 +439,8 @@ public: , m_replaceDotForArrow(static_cast(model)->m_replaceDotForArrow) {} - bool isCorrective() const Q_DECL_OVERRIDE { return m_replaceDotForArrow; } - void makeCorrection(TextEditorWidget *editorWidget) Q_DECL_OVERRIDE; + bool isCorrective() const override { return m_replaceDotForArrow; } + void makeCorrection(TextEditorWidget *editorWidget) override; private: bool m_replaceDotForArrow; diff --git a/src/plugins/cpptools/cppcompletionassist.h b/src/plugins/cpptools/cppcompletionassist.h index beea43dc23f..cc3a030a7c5 100644 --- a/src/plugins/cpptools/cppcompletionassist.h +++ b/src/plugins/cpptools/cppcompletionassist.h @@ -74,8 +74,8 @@ public: m_typeOfExpression->setExpandTemplates(true); } - bool isSortable(const QString &prefix) const Q_DECL_OVERRIDE; - TextEditor::AssistProposalItem *proposalItem(int index) const Q_DECL_OVERRIDE; + bool isSortable(const QString &prefix) const override; + TextEditor::AssistProposalItem *proposalItem(int index) const override; unsigned m_completionOperator; bool m_replaceDotForArrow; @@ -87,14 +87,14 @@ class InternalCompletionAssistProvider : public CppCompletionAssistProvider Q_OBJECT public: - TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE; + TextEditor::IAssistProcessor *createProcessor() const override; TextEditor::AssistInterface *createAssistInterface( const QString &filePath, QTextDocument *document, const CPlusPlus::LanguageFeatures &languageFeatures, int position, - TextEditor::AssistReason reason) const Q_DECL_OVERRIDE; + TextEditor::AssistReason reason) const override; }; class InternalCppCompletionAssistProcessor : public CppCompletionAssistProcessor @@ -103,7 +103,7 @@ public: InternalCppCompletionAssistProcessor(); ~InternalCppCompletionAssistProcessor(); - TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE; + TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override; private: TextEditor::IAssistProposal *createContentProposal(); diff --git a/src/plugins/cpptools/cppcompletionassistprovider.h b/src/plugins/cpptools/cppcompletionassistprovider.h index 735ca71c3bc..af67e68e0a5 100644 --- a/src/plugins/cpptools/cppcompletionassistprovider.h +++ b/src/plugins/cpptools/cppcompletionassistprovider.h @@ -54,10 +54,10 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio Q_OBJECT public: - 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; + bool supportsEditor(Core::Id editorId) const override; + int activationCharSequenceLength() const override; + bool isActivationCharSequence(const QString &sequence) const override; + bool isContinuationChar(const QChar &c) const override; virtual TextEditor::AssistInterface *createAssistInterface( const QString &filePath, diff --git a/src/plugins/cpptools/cppfunctionsfilter.h b/src/plugins/cpptools/cppfunctionsfilter.h index b440ebb1542..dff5ec225de 100644 --- a/src/plugins/cpptools/cppfunctionsfilter.h +++ b/src/plugins/cpptools/cppfunctionsfilter.h @@ -47,8 +47,8 @@ public: ~CppFunctionsFilter(); protected: - IndexItem::ItemType matchTypes() const Q_DECL_OVERRIDE { return IndexItem::Function; } - Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) Q_DECL_OVERRIDE; + IndexItem::ItemType matchTypes() const override { return IndexItem::Function; } + Core::LocatorFilterEntry filterEntryFromIndexItem(IndexItem::Ptr info) override; }; } // namespace Internal diff --git a/src/plugins/cpptools/cppsourceprocessor.h b/src/plugins/cpptools/cppsourceprocessor.h index cd5f160897a..2b4d805a541 100644 --- a/src/plugins/cpptools/cppsourceprocessor.h +++ b/src/plugins/cpptools/cppsourceprocessor.h @@ -93,22 +93,22 @@ private: void mergeEnvironment(CPlusPlus::Document::Ptr doc); // Client interface - void macroAdded(const CPlusPlus::Macro ¯o) Q_DECL_OVERRIDE; + void macroAdded(const CPlusPlus::Macro ¯o) override; void passedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charsOffset, - unsigned line, const CPlusPlus::Macro ¯o) Q_DECL_OVERRIDE; + unsigned line, const CPlusPlus::Macro ¯o) override; void failedMacroDefinitionCheck(unsigned bytesOffset, unsigned utf16charOffset, - const CPlusPlus::ByteArrayRef &name) Q_DECL_OVERRIDE; + const CPlusPlus::ByteArrayRef &name) override; void notifyMacroReference(unsigned bytesOffset, unsigned utf16charOffset, - unsigned line, const CPlusPlus::Macro ¯o) Q_DECL_OVERRIDE; + unsigned line, const CPlusPlus::Macro ¯o) override; void startExpandingMacro(unsigned bytesOffset, unsigned utf16charOffset, unsigned line, const CPlusPlus::Macro ¯o, - const QVector &actuals) Q_DECL_OVERRIDE; - void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro ¯o) Q_DECL_OVERRIDE; - void markAsIncludeGuard(const QByteArray ¯oName) Q_DECL_OVERRIDE; - void startSkippingBlocks(unsigned utf16charsOffset) Q_DECL_OVERRIDE; - void stopSkippingBlocks(unsigned utf16charsOffset) Q_DECL_OVERRIDE; + const QVector &actuals) override; + void stopExpandingMacro(unsigned bytesOffset, const CPlusPlus::Macro ¯o) override; + void markAsIncludeGuard(const QByteArray ¯oName) override; + void startSkippingBlocks(unsigned utf16charsOffset) override; + void stopSkippingBlocks(unsigned utf16charsOffset) override; void sourceNeeded(unsigned line, const QString &fileName, IncludeType type, - const QStringList &initialIncludes) Q_DECL_OVERRIDE; + const QStringList &initialIncludes) override; private: CPlusPlus::Snapshot m_snapshot;