From dff9ceb92935bff7fd9fb1a5139cee86d1311290 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Wed, 3 Jun 2015 15:32:02 +0200
Subject: [PATCH] qmljseditor: s/Q_DECL_OVERRIDE/override/g
Change-Id: Ie01505be57f8e16b782ebd8ed1ff339cfb63cd8c
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
---
.../qmljseditor/qmljscompletionassist.cpp | 22 +++++++++----------
.../qmljseditor/qmljscompletionassist.h | 22 +++++++++----------
src/plugins/qmljseditor/qmljsquickfixassist.h | 8 +++----
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp
index c70429224c7..8bcf186ff68 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.cpp
+++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp
@@ -135,7 +135,7 @@ public:
, order(order)
{}
- void operator()(const Value *base, const QString &name, const Value *value) Q_DECL_OVERRIDE
+ void operator()(const Value *base, const QString &name, const Value *value) override
{
Q_UNUSED(base)
QVariant data;
@@ -163,7 +163,7 @@ public:
, afterOn(afterOn)
{}
- void operator ()(const Value *base, const QString &name, const Value *) Q_DECL_OVERRIDE
+ void operator ()(const Value *base, const QString &name, const Value *) override
{
const CppComponentValue *qmlBase = value_cast<CppComponentValue>(base);
@@ -245,34 +245,34 @@ private:
(*_propertyProcessor)(_currentObject, name, value);
}
- bool processProperty(const QString &name, const Value *value, const PropertyInfo &) Q_DECL_OVERRIDE
+ bool processProperty(const QString &name, const Value *value, const PropertyInfo &) override
{
process(name, value);
return true;
}
- bool processEnumerator(const QString &name, const Value *value) Q_DECL_OVERRIDE
+ bool processEnumerator(const QString &name, const Value *value) override
{
if (! _globalCompletion)
process(name, value);
return true;
}
- bool processSignal(const QString &name, const Value *value) Q_DECL_OVERRIDE
+ bool processSignal(const QString &name, const Value *value) override
{
if (_globalCompletion)
process(name, value);
return true;
}
- bool processSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
+ bool processSlot(const QString &name, const Value *value) override
{
if (_enumerateSlots)
process(name, value);
return true;
}
- bool processGeneratedSlot(const QString &name, const Value *value) Q_DECL_OVERRIDE
+ bool processGeneratedSlot(const QString &name, const Value *value) override
{
if (_enumerateGeneratedSlots || (_currentObject && _currentObject->className().endsWith(QLatin1String("Keys")))) {
// ### FIXME: add support for attached properties.
@@ -403,10 +403,10 @@ public:
, m_isVariadic(isVariadic)
{}
- void reset() Q_DECL_OVERRIDE {}
- int size() const Q_DECL_OVERRIDE { return 1; }
- 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 1; }
+ QString text(int index) const override;
+ int activeArgument(const QString &prefix) const override;
private:
QString m_functionName;
diff --git a/src/plugins/qmljseditor/qmljscompletionassist.h b/src/plugins/qmljseditor/qmljscompletionassist.h
index b281cf63fae..a10acc5e75d 100644
--- a/src/plugins/qmljseditor/qmljscompletionassist.h
+++ b/src/plugins/qmljseditor/qmljscompletionassist.h
@@ -57,9 +57,9 @@ namespace Internal {
class QmlJSAssistProposalItem : public TextEditor::AssistProposalItem
{
public:
- bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE;
+ bool prematurelyApplies(const QChar &c) const override;
void applyContextualContent(TextEditor::TextEditorWidget *editorWidget,
- int basePosition) const Q_DECL_OVERRIDE;
+ int basePosition) const override;
};
@@ -71,9 +71,9 @@ public:
loadContent(items);
}
- void filter(const QString &prefix) Q_DECL_OVERRIDE;
- void sort(const QString &prefix) Q_DECL_OVERRIDE;
- bool keepPerfectMatch(TextEditor::AssistReason reason) const Q_DECL_OVERRIDE;
+ void filter(const QString &prefix) override;
+ void sort(const QString &prefix) override;
+ bool keepPerfectMatch(TextEditor::AssistReason reason) const override;
};
@@ -82,12 +82,12 @@ class QmlJSCompletionAssistProvider : public TextEditor::CompletionAssistProvide
Q_OBJECT
public:
- bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
- TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
+ bool supportsEditor(Core::Id editorId) const override;
+ TextEditor::IAssistProcessor *createProcessor() const 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;
+ int activationCharSequenceLength() const override;
+ bool isActivationCharSequence(const QString &sequence) const override;
+ bool isContinuationChar(const QChar &c) const override;
};
@@ -97,7 +97,7 @@ public:
QmlJSCompletionAssistProcessor();
~QmlJSCompletionAssistProcessor();
- TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE;
+ TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override;
private:
TextEditor::IAssistProposal *createContentProposal() const;
diff --git a/src/plugins/qmljseditor/qmljsquickfixassist.h b/src/plugins/qmljseditor/qmljsquickfixassist.h
index 9aa337e784f..4cd5355f71d 100644
--- a/src/plugins/qmljseditor/qmljsquickfixassist.h
+++ b/src/plugins/qmljseditor/qmljsquickfixassist.h
@@ -64,11 +64,11 @@ public:
QmlJSQuickFixAssistProvider();
~QmlJSQuickFixAssistProvider();
- IAssistProvider::RunType runType() const Q_DECL_OVERRIDE;
- bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
- TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
+ IAssistProvider::RunType runType() const override;
+ bool supportsEditor(Core::Id editorId) const override;
+ TextEditor::IAssistProcessor *createProcessor() const override;
- QList<TextEditor::QuickFixFactory *> quickFixFactories() const Q_DECL_OVERRIDE;
+ QList<TextEditor::QuickFixFactory *> quickFixFactories() const override;
};
} // Internal
--
GitLab