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

glsleditor: s/Q_DECL_OVERRIDE/override/g

Browse Source 
Change-Id: I818ad4a11c70a455462e91478b8ac955ad634530
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-03 15:32:25 +02:00
committed by hjk
parent 35680abd9e
commit e9d05d82b6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/glsleditor/glslcompletionassist.cpp
View File

@@ -177,10 +177,10 @@ public:
, m_currentArg(-1) , m_currentArg(-1)
{} {}
void reset() Q_DECL_OVERRIDE {} void reset() override {}
int size() const Q_DECL_OVERRIDE { return m_items.size(); } int size() const override { return m_items.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:
QVector<GLSL::Function *> m_items; QVector<GLSL::Function *> m_items;

10
src/plugins/glsleditor/glslcompletionassist.h
View File

@@ -91,11 +91,11 @@ class GlslCompletionAssistProvider : public TextEditor::CompletionAssistProvider
Q_OBJECT Q_OBJECT
public: public:
bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE; bool supportsEditor(Core::Id editorId) const override;
TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE; TextEditor::IAssistProcessor *createProcessor() 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;
}; };
class GlslCompletionAssistProcessor : public TextEditor::IAssistProcessor class GlslCompletionAssistProcessor : public TextEditor::IAssistProcessor
@@ -104,7 +104,7 @@ public:
GlslCompletionAssistProcessor(); GlslCompletionAssistProcessor();
~GlslCompletionAssistProcessor(); ~GlslCompletionAssistProcessor();
TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE; TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) override;
private: private:
TextEditor::IAssistProposal *createHintProposal(const QVector<GLSL::Function *> &symbols); TextEditor::IAssistProposal *createHintProposal(const QVector<GLSL::Function *> &symbols);