diff options
author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-03 15:32:25 +0200 |
---|---|---|
committer | hjk <hjk@theqtcompany.com> | 2015-06-04 07:13:15 +0000 |
commit | e9d05d82b696abdf99392fb5b7844076ec9b873a (patch) | |
tree | 2d355db003bb98cbdd20bb4140d63cc37385f8e7 /src/plugins/glsleditor | |
parent | 35680abd9e1fc64c09065b929fe2e5c754846267 (diff) | |
download | qt-creator-e9d05d82b696abdf99392fb5b7844076ec9b873a.tar.gz |
glsleditor: s/Q_DECL_OVERRIDE/override/g
Change-Id: I818ad4a11c70a455462e91478b8ac955ad634530
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/glsleditor')
-rw-r--r-- | src/plugins/glsleditor/glslcompletionassist.cpp | 8 | ||||
-rw-r--r-- | src/plugins/glsleditor/glslcompletionassist.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/glsleditor/glslcompletionassist.cpp b/src/plugins/glsleditor/glslcompletionassist.cpp index ab0a8520a9..0d3613d15a 100644 --- a/src/plugins/glsleditor/glslcompletionassist.cpp +++ b/src/plugins/glsleditor/glslcompletionassist.cpp @@ -177,10 +177,10 @@ public: , m_currentArg(-1) {} - void reset() Q_DECL_OVERRIDE {} - int size() const Q_DECL_OVERRIDE { return m_items.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_items.size(); } + QString text(int index) const override; + int activeArgument(const QString &prefix) const override; private: QVector<GLSL::Function *> m_items; diff --git a/src/plugins/glsleditor/glslcompletionassist.h b/src/plugins/glsleditor/glslcompletionassist.h index f6c8e0a24d..ba731e87ae 100644 --- a/src/plugins/glsleditor/glslcompletionassist.h +++ b/src/plugins/glsleditor/glslcompletionassist.h @@ -91,11 +91,11 @@ class GlslCompletionAssistProvider : public TextEditor::CompletionAssistProvider 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; + int activationCharSequenceLength() const override; + bool isActivationCharSequence(const QString &sequence) const override; }; class GlslCompletionAssistProcessor : public TextEditor::IAssistProcessor @@ -104,7 +104,7 @@ public: GlslCompletionAssistProcessor(); ~GlslCompletionAssistProcessor(); - TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE; + TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override; private: TextEditor::IAssistProposal *createHintProposal(const QVector<GLSL::Function *> &symbols); |