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

texteditor: s/Q_DECL_OVERRIDE/override/g

Browse Source 
Change-Id: I8ce0a93f25fe483d07d48a6525748fe40d647feb
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-03 15:31:41 +02:00
parent b5641c7d43
commit 314d4ce41f
10 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/circularclipboardassist.cpp
View File

@@ -63,7 +63,7 @@ public:
setText(text); 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 //Move to last in circular clipboard
@@ -87,7 +87,7 @@ private:
class ClipboardAssistProcessor: public IAssistProcessor class ClipboardAssistProcessor: public IAssistProcessor
{ {
public: public:
IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE IAssistProposal *perform(const AssistInterface *interface) override
{ {
if (!interface) if (!interface)
return 0; return 0;

6
src/plugins/texteditor/circularclipboardassist.h
View File

@@ -40,9 +40,9 @@ namespace Internal {
class ClipboardAssistProvider: public IAssistProvider class ClipboardAssistProvider: public IAssistProvider
{ {
public: public:
IAssistProvider::RunType runType() const Q_DECL_OVERRIDE; IAssistProvider::RunType runType() const override;
bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE; bool supportsEditor(Core::Id editorId) const override;
IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE; IAssistProcessor *createProcessor() const override;
}; };
} // namespace Internal } // namespace Internal

2
src/plugins/texteditor/codeassist/completionassistprovider.h
View File

@@ -44,7 +44,7 @@ public:
CompletionAssistProvider(); CompletionAssistProvider();
~CompletionAssistProvider(); ~CompletionAssistProvider();
IAssistProvider::RunType runType() const Q_DECL_OVERRIDE; IAssistProvider::RunType runType() const override;
virtual int activationCharSequenceLength() const; virtual int activationCharSequenceLength() const;
virtual bool isActivationCharSequence(const QString &sequence) const; virtual bool isActivationCharSequence(const QString &sequence) const;
virtual bool isContinuationChar(const QChar &c) const; virtual bool isContinuationChar(const QChar &c) const;

12
src/plugins/texteditor/codeassist/functionhintproposal.h
View File

@@ -44,12 +44,12 @@ public:
FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model); FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model);
~FunctionHintProposal(); ~FunctionHintProposal();
bool isFragile() const Q_DECL_OVERRIDE; bool isFragile() const override;
int basePosition() const Q_DECL_OVERRIDE; int basePosition() const override;
bool isCorrective() const Q_DECL_OVERRIDE; bool isCorrective() const override;
void makeCorrection(TextEditorWidget *editorWidget) Q_DECL_OVERRIDE; void makeCorrection(TextEditorWidget *editorWidget) override;
IAssistProposalModel *model() const Q_DECL_OVERRIDE; IAssistProposalModel *model() const override;
IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE; IAssistProposalWidget *createWidget() const override;
private: private:
int m_basePosition; int m_basePosition;

22
src/plugins/texteditor/codeassist/functionhintproposalwidget.h
View File

@@ -46,20 +46,20 @@ public:
FunctionHintProposalWidget(); FunctionHintProposalWidget();
~FunctionHintProposalWidget(); ~FunctionHintProposalWidget();
void setAssistant(CodeAssistant *assistant) Q_DECL_OVERRIDE; void setAssistant(CodeAssistant *assistant) override;
void setReason(AssistReason reason) Q_DECL_OVERRIDE; void setReason(AssistReason reason) override;
void setKind(AssistKind kind) Q_DECL_OVERRIDE; void setKind(AssistKind kind) override;
void setUnderlyingWidget(const QWidget *underlyingWidget) Q_DECL_OVERRIDE; void setUnderlyingWidget(const QWidget *underlyingWidget) override;
void setModel(IAssistProposalModel *model) Q_DECL_OVERRIDE; void setModel(IAssistProposalModel *model) override;
void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE; void setDisplayRect(const QRect &rect) override;
void setIsSynchronized(bool isSync) Q_DECL_OVERRIDE; void setIsSynchronized(bool isSync) override;
void showProposal(const QString &prefix) Q_DECL_OVERRIDE; void showProposal(const QString &prefix) override;
void updateProposal(const QString &prefix) Q_DECL_OVERRIDE; void updateProposal(const QString &prefix) override;
void closeProposal() Q_DECL_OVERRIDE; void closeProposal() override;
protected: protected:
bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; bool eventFilter(QObject *o, QEvent *e) override;
private slots: private slots:
void nextPage(); void nextPage();

12
src/plugins/texteditor/codeassist/genericproposal.h
View File

@@ -46,12 +46,12 @@ public:
GenericProposal(int cursorPos, const QList<AssistProposalItem *> &items); GenericProposal(int cursorPos, const QList<AssistProposalItem *> &items);
~GenericProposal(); ~GenericProposal();
bool isFragile() const Q_DECL_OVERRIDE; bool isFragile() const override;
int basePosition() const Q_DECL_OVERRIDE; int basePosition() const override;
bool isCorrective() const Q_DECL_OVERRIDE; bool isCorrective() const override;
void makeCorrection(TextEditorWidget *editorWidget) Q_DECL_OVERRIDE; void makeCorrection(TextEditorWidget *editorWidget) override;
IAssistProposalModel *model() const Q_DECL_OVERRIDE; IAssistProposalModel *model() const override;
IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE; IAssistProposalWidget *createWidget() const override;
protected: protected:
void moveBasePosition(int length); void moveBasePosition(int length);

6
src/plugins/texteditor/codeassist/genericproposalmodel.h
View File

@@ -52,9 +52,9 @@ public:
GenericProposalModel(); GenericProposalModel();
~GenericProposalModel(); ~GenericProposalModel();
void reset() Q_DECL_OVERRIDE; void reset() override;
int size() const Q_DECL_OVERRIDE; int size() const override;
QString text(int index) const Q_DECL_OVERRIDE; QString text(int index) const override;
virtual QIcon icon(int index) const; virtual QIcon icon(int index) const;
virtual QString detail(int index) const; virtual QString detail(int index) const;

20
src/plugins/texteditor/codeassist/genericproposalwidget.h
View File

@@ -50,17 +50,17 @@ public:
GenericProposalWidget(); GenericProposalWidget();
~GenericProposalWidget(); ~GenericProposalWidget();
void setAssistant(CodeAssistant *assistant) Q_DECL_OVERRIDE; void setAssistant(CodeAssistant *assistant) override;
void setReason(AssistReason reason) Q_DECL_OVERRIDE; void setReason(AssistReason reason) override;
void setKind(AssistKind kind) Q_DECL_OVERRIDE; void setKind(AssistKind kind) override;
void setUnderlyingWidget(const QWidget *underlyingWidget) Q_DECL_OVERRIDE; void setUnderlyingWidget(const QWidget *underlyingWidget) override;
void setModel(IAssistProposalModel *model) Q_DECL_OVERRIDE; void setModel(IAssistProposalModel *model) override;
void setDisplayRect(const QRect &rect) Q_DECL_OVERRIDE; void setDisplayRect(const QRect &rect) override;
void setIsSynchronized(bool isSync) Q_DECL_OVERRIDE; void setIsSynchronized(bool isSync) override;
void showProposal(const QString &prefix) Q_DECL_OVERRIDE; void showProposal(const QString &prefix) override;
void updateProposal(const QString &prefix) Q_DECL_OVERRIDE; void updateProposal(const QString &prefix) override;
void closeProposal() Q_DECL_OVERRIDE; void closeProposal() override;
private: private:
bool updateAndCheck(const QString &prefix); bool updateAndCheck(const QString &prefix);

14
src/plugins/texteditor/codeassist/keywordscompletionassist.h
View File

@@ -62,8 +62,8 @@ public:
KeywordsAssistProposalItem(bool isFunction); KeywordsAssistProposalItem(bool isFunction);
~KeywordsAssistProposalItem(); ~KeywordsAssistProposalItem();
bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE; bool prematurelyApplies(const QChar &c) const override;
void applyContextualContent(TextEditorWidget *editorWidget, int basePosition) const Q_DECL_OVERRIDE; void applyContextualContent(TextEditorWidget *editorWidget, int basePosition) const override;
private: private:
bool m_isFunction; bool m_isFunction;
}; };
@@ -74,10 +74,10 @@ public:
KeywordsFunctionHintModel(const QStringList &functionSymbols); KeywordsFunctionHintModel(const QStringList &functionSymbols);
~KeywordsFunctionHintModel(); ~KeywordsFunctionHintModel();
void reset() Q_DECL_OVERRIDE; void reset() override;
int size() const Q_DECL_OVERRIDE; int size() const override;
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:
QStringList m_functionSymbols; QStringList m_functionSymbols;
@@ -89,7 +89,7 @@ public:
KeywordsCompletionAssistProcessor(Keywords keywords); KeywordsCompletionAssistProcessor(Keywords keywords);
~KeywordsCompletionAssistProcessor(); ~KeywordsCompletionAssistProcessor();
IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE; IAssistProposal *perform(const AssistInterface *interface) override;
QChar startOfCommentChar() const; QChar startOfCommentChar() const;
protected: protected:

2
src/plugins/texteditor/codeassist/quickfixassistprocessor.h
View File

@@ -44,7 +44,7 @@ public:
~QuickFixAssistProcessor(); ~QuickFixAssistProcessor();
private: private:
IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE; IAssistProposal *perform(const AssistInterface *interface) override;
const QuickFixAssistProvider *m_provider; const QuickFixAssistProvider *m_provider;
}; };