From 314d4ce41f11109b88cc630f91b98c3ed4615104 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 3 Jun 2015 15:31:41 +0200 Subject: [PATCH] texteditor: s/Q_DECL_OVERRIDE/override/g Change-Id: I8ce0a93f25fe483d07d48a6525748fe40d647feb Reviewed-by: David Schulz --- .../texteditor/circularclipboardassist.cpp | 4 ++-- .../texteditor/circularclipboardassist.h | 6 ++--- .../codeassist/completionassistprovider.h | 2 +- .../codeassist/functionhintproposal.h | 12 +++++----- .../codeassist/functionhintproposalwidget.h | 22 +++++++++---------- .../texteditor/codeassist/genericproposal.h | 12 +++++----- .../codeassist/genericproposalmodel.h | 6 ++--- .../codeassist/genericproposalwidget.h | 20 ++++++++--------- .../codeassist/keywordscompletionassist.h | 14 ++++++------ .../codeassist/quickfixassistprocessor.h | 2 +- 10 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/plugins/texteditor/circularclipboardassist.cpp b/src/plugins/texteditor/circularclipboardassist.cpp index 218d99f8a1c..472186f1ec7 100644 --- a/src/plugins/texteditor/circularclipboardassist.cpp +++ b/src/plugins/texteditor/circularclipboardassist.cpp @@ -63,7 +63,7 @@ public: setText(text); } - void apply(TextEditorWidget *editorWidget, int /*basePosition*/) const Q_DECL_OVERRIDE + void apply(TextEditorWidget *editorWidget, int /*basePosition*/) const override { //Move to last in circular clipboard @@ -87,7 +87,7 @@ private: class ClipboardAssistProcessor: public IAssistProcessor { public: - IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE + IAssistProposal *perform(const AssistInterface *interface) override { if (!interface) return 0; diff --git a/src/plugins/texteditor/circularclipboardassist.h b/src/plugins/texteditor/circularclipboardassist.h index 05cb67bdaae..c5ecc0fed95 100644 --- a/src/plugins/texteditor/circularclipboardassist.h +++ b/src/plugins/texteditor/circularclipboardassist.h @@ -40,9 +40,9 @@ namespace Internal { class ClipboardAssistProvider: public IAssistProvider { public: - IAssistProvider::RunType runType() const Q_DECL_OVERRIDE; - bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE; - IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE; + IAssistProvider::RunType runType() const override; + bool supportsEditor(Core::Id editorId) const override; + IAssistProcessor *createProcessor() const override; }; } // namespace Internal diff --git a/src/plugins/texteditor/codeassist/completionassistprovider.h b/src/plugins/texteditor/codeassist/completionassistprovider.h index 9da8f1533a9..0b39fd8b8f9 100644 --- a/src/plugins/texteditor/codeassist/completionassistprovider.h +++ b/src/plugins/texteditor/codeassist/completionassistprovider.h @@ -44,7 +44,7 @@ public: CompletionAssistProvider(); ~CompletionAssistProvider(); - IAssistProvider::RunType runType() const Q_DECL_OVERRIDE; + IAssistProvider::RunType runType() const override; virtual int activationCharSequenceLength() const; virtual bool isActivationCharSequence(const QString &sequence) const; virtual bool isContinuationChar(const QChar &c) const; diff --git a/src/plugins/texteditor/codeassist/functionhintproposal.h b/src/plugins/texteditor/codeassist/functionhintproposal.h index e785d2d7ac0..0c2f081ab95 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposal.h +++ b/src/plugins/texteditor/codeassist/functionhintproposal.h @@ -44,12 +44,12 @@ public: FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model); ~FunctionHintProposal(); - bool isFragile() const Q_DECL_OVERRIDE; - int basePosition() const Q_DECL_OVERRIDE; - bool isCorrective() const Q_DECL_OVERRIDE; - void makeCorrection(TextEditorWidget *editorWidget) Q_DECL_OVERRIDE; - IAssistProposalModel *model() const Q_DECL_OVERRIDE; - IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE; + bool isFragile() const override; + int basePosition() const override; + bool isCorrective() const override; + void makeCorrection(TextEditorWidget *editorWidget) override; + IAssistProposalModel *model() const override; + IAssistProposalWidget *createWidget() const override; private: int m_basePosition; diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h index ee18674a263..3b4b68d1415 100644 --- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.h +++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.h @@ -46,20 +46,20 @@ public: FunctionHintProposalWidget(); ~FunctionHintProposalWidget(); - void setAssistant(CodeAssistant *assistant) Q_DECL_OVERRIDE; - void setReason(AssistReason reason) Q_DECL_OVERRIDE; - void setKind(AssistKind kind) Q_DECL_OVERRIDE; - void setUnderlyingWidget(const QWidget *underlyingWidget) Q_DECL_OVERRIDE; - void setModel(IAssistProposalModel *model) Q_DECL_OVERRIDE; - void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE; - void setIsSynchronized(bool isSync) Q_DECL_OVERRIDE; + void setAssistant(CodeAssistant *assistant) override; + void setReason(AssistReason reason) override; + void setKind(AssistKind kind) override; + void setUnderlyingWidget(const QWidget *underlyingWidget) override; + void setModel(IAssistProposalModel *model) override; + void setDisplayRect(const QRect &rect) override; + void setIsSynchronized(bool isSync) override; - void showProposal(const QString &prefix) Q_DECL_OVERRIDE; - void updateProposal(const QString &prefix) Q_DECL_OVERRIDE; - void closeProposal() Q_DECL_OVERRIDE; + void showProposal(const QString &prefix) override; + void updateProposal(const QString &prefix) override; + void closeProposal() override; protected: - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; private slots: void nextPage(); diff --git a/src/plugins/texteditor/codeassist/genericproposal.h b/src/plugins/texteditor/codeassist/genericproposal.h index d99ba953a95..7204d3503a5 100644 --- a/src/plugins/texteditor/codeassist/genericproposal.h +++ b/src/plugins/texteditor/codeassist/genericproposal.h @@ -46,12 +46,12 @@ public: GenericProposal(int cursorPos, const QList &items); ~GenericProposal(); - bool isFragile() const Q_DECL_OVERRIDE; - int basePosition() const Q_DECL_OVERRIDE; - bool isCorrective() const Q_DECL_OVERRIDE; - void makeCorrection(TextEditorWidget *editorWidget) Q_DECL_OVERRIDE; - IAssistProposalModel *model() const Q_DECL_OVERRIDE; - IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE; + bool isFragile() const override; + int basePosition() const override; + bool isCorrective() const override; + void makeCorrection(TextEditorWidget *editorWidget) override; + IAssistProposalModel *model() const override; + IAssistProposalWidget *createWidget() const override; protected: void moveBasePosition(int length); diff --git a/src/plugins/texteditor/codeassist/genericproposalmodel.h b/src/plugins/texteditor/codeassist/genericproposalmodel.h index a147991a524..a68bf21134e 100644 --- a/src/plugins/texteditor/codeassist/genericproposalmodel.h +++ b/src/plugins/texteditor/codeassist/genericproposalmodel.h @@ -52,9 +52,9 @@ public: GenericProposalModel(); ~GenericProposalModel(); - void reset() Q_DECL_OVERRIDE; - int size() const Q_DECL_OVERRIDE; - QString text(int index) const Q_DECL_OVERRIDE; + void reset() override; + int size() const override; + QString text(int index) const override; virtual QIcon icon(int index) const; virtual QString detail(int index) const; diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.h b/src/plugins/texteditor/codeassist/genericproposalwidget.h index e930f4730d1..18541a8c9be 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.h +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.h @@ -50,17 +50,17 @@ public: GenericProposalWidget(); ~GenericProposalWidget(); - void setAssistant(CodeAssistant *assistant) Q_DECL_OVERRIDE; - void setReason(AssistReason reason) Q_DECL_OVERRIDE; - void setKind(AssistKind kind) Q_DECL_OVERRIDE; - void setUnderlyingWidget(const QWidget *underlyingWidget) Q_DECL_OVERRIDE; - void setModel(IAssistProposalModel *model) Q_DECL_OVERRIDE; - void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE; - void setIsSynchronized(bool isSync) Q_DECL_OVERRIDE; + void setAssistant(CodeAssistant *assistant) override; + void setReason(AssistReason reason) override; + void setKind(AssistKind kind) override; + void setUnderlyingWidget(const QWidget *underlyingWidget) override; + void setModel(IAssistProposalModel *model) override; + void setDisplayRect(const QRect &rect) override; + void setIsSynchronized(bool isSync) override; - void showProposal(const QString &prefix) Q_DECL_OVERRIDE; - void updateProposal(const QString &prefix) Q_DECL_OVERRIDE; - void closeProposal() Q_DECL_OVERRIDE; + void showProposal(const QString &prefix) override; + void updateProposal(const QString &prefix) override; + void closeProposal() override; private: bool updateAndCheck(const QString &prefix); diff --git a/src/plugins/texteditor/codeassist/keywordscompletionassist.h b/src/plugins/texteditor/codeassist/keywordscompletionassist.h index 1161038ef9d..bf47db611f0 100644 --- a/src/plugins/texteditor/codeassist/keywordscompletionassist.h +++ b/src/plugins/texteditor/codeassist/keywordscompletionassist.h @@ -62,8 +62,8 @@ public: KeywordsAssistProposalItem(bool isFunction); ~KeywordsAssistProposalItem(); - 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; private: bool m_isFunction; }; @@ -74,10 +74,10 @@ public: KeywordsFunctionHintModel(const QStringList &functionSymbols); ~KeywordsFunctionHintModel(); - void reset() Q_DECL_OVERRIDE; - int size() const Q_DECL_OVERRIDE; - QString text(int index) const Q_DECL_OVERRIDE; - int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE; + void reset() override; + int size() const override; + QString text(int index) const override; + int activeArgument(const QString &prefix) const override; private: QStringList m_functionSymbols; @@ -89,7 +89,7 @@ public: KeywordsCompletionAssistProcessor(Keywords keywords); ~KeywordsCompletionAssistProcessor(); - IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE; + IAssistProposal *perform(const AssistInterface *interface) override; QChar startOfCommentChar() const; protected: diff --git a/src/plugins/texteditor/codeassist/quickfixassistprocessor.h b/src/plugins/texteditor/codeassist/quickfixassistprocessor.h index 2066e874a11..5b6c1c6ce5a 100644 --- a/src/plugins/texteditor/codeassist/quickfixassistprocessor.h +++ b/src/plugins/texteditor/codeassist/quickfixassistprocessor.h @@ -44,7 +44,7 @@ public: ~QuickFixAssistProcessor(); private: - IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE; + IAssistProposal *perform(const AssistInterface *interface) override; const QuickFixAssistProvider *m_provider; };