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

cppeditor: s/Q_DECL_OVERRIDE/override/g

Browse Source 
Change-Id: Ie0b75ea64ec3927732b484983311990c8ca0d057
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-06-03 15:32:45 +02:00
parent e5da3d8aeb
commit a1b8e94f0b
7 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/cppeditor/cppeditor.h
View File

@@ -79,14 +79,14 @@ public:
TextEditor::AssistInterface *createAssistInterface( TextEditor::AssistInterface *createAssistInterface(
TextEditor::AssistKind kind, TextEditor::AssistKind kind,
TextEditor::AssistReason reason) const Q_DECL_OVERRIDE; TextEditor::AssistReason reason) const override;
FollowSymbolUnderCursor *followSymbolUnderCursorDelegate(); // exposed for tests FollowSymbolUnderCursor *followSymbolUnderCursorDelegate(); // exposed for tests
public slots: public slots:
void paste() Q_DECL_OVERRIDE; void paste() override;
void cut() Q_DECL_OVERRIDE; void cut() override;
void selectAll() Q_DECL_OVERRIDE; void selectAll() override;
void switchDeclarationDefinition(bool inNextSplit); void switchDeclarationDefinition(bool inNextSplit);
void showPreProcessorWidget(); void showPreProcessorWidget();
@@ -96,18 +96,18 @@ public slots:
void renameUsages(const QString &replacement = QString()); void renameUsages(const QString &replacement = QString());
protected: protected:
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE; void contextMenuEvent(QContextMenuEvent *) override;
void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent *e) override;
bool handleStringSplitting(QKeyEvent *e) const; bool handleStringSplitting(QKeyEvent *e) const;
Link findLinkAt(const QTextCursor &, bool resolveTarget = true, Link findLinkAt(const QTextCursor &, bool resolveTarget = true,
bool inNextSplit = false) Q_DECL_OVERRIDE; bool inNextSplit = false) override;
void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker) Q_DECL_OVERRIDE; void onRefactorMarkerClicked(const TextEditor::RefactorMarker &marker) override;
protected slots: protected slots:
void slotCodeStyleSettingsChanged(const QVariant &) Q_DECL_OVERRIDE; void slotCodeStyleSettingsChanged(const QVariant &) override;
private slots: private slots:
void updateFunctionDeclDefLink(); void updateFunctionDeclDefLink();
@@ -131,8 +131,8 @@ private slots:
void processKeyNormally(QKeyEvent *e); void processKeyNormally(QKeyEvent *e);
private: private:
void finalizeInitialization() Q_DECL_OVERRIDE; void finalizeInitialization() override;
void finalizeInitializationAfterDuplication(TextEditorWidget *other) Q_DECL_OVERRIDE; void finalizeInitializationAfterDuplication(TextEditorWidget *other) override;
unsigned documentRevision() const; unsigned documentRevision() const;

2
src/plugins/cppeditor/cppeditorplugin.h
View File

@@ -86,7 +86,7 @@ private slots:
#ifdef WITH_TESTS #ifdef WITH_TESTS
private: private:
QList<QObject *> createTestObjects() const Q_DECL_OVERRIDE; QList<QObject *> createTestObjects() const override;
private slots: private slots:
// The following tests expect that no projects are loaded on start-up. // The following tests expect that no projects are loaded on start-up.

8
src/plugins/cppeditor/cppquickfixassistant.h
View File

@@ -77,11 +77,11 @@ private:
class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
{ {
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;
TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE; TextEditor::IAssistProcessor *createProcessor() const override;
QList<TextEditor::QuickFixFactory *> quickFixFactories() const Q_DECL_OVERRIDE; QList<TextEditor::QuickFixFactory *> quickFixFactories() const override;
}; };
} // Internal } // Internal

2
src/plugins/cppeditor/cppquickfixes.cpp
View File

@@ -4017,7 +4017,7 @@ public:
: QuickFixFactory::tr("Convert to Pointer")); : QuickFixFactory::tr("Convert to Pointer"));
} }
void perform() Q_DECL_OVERRIDE void perform() override
{ {
ChangeSet changes; ChangeSet changes;

10
src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
View File

@@ -89,7 +89,7 @@ protected:
return GenericProposalWidget::eventFilter(o, e); return GenericProposalWidget::eventFilter(o, e);
} }
void showProposal(const QString &prefix) Q_DECL_OVERRIDE void showProposal(const QString &prefix) override
{ {
GenericProposalModel *proposalModel = model(); GenericProposalModel *proposalModel = model();
if (proposalModel && proposalModel->size() == 1) { if (proposalModel && proposalModel->size() == 1) {
@@ -112,9 +112,9 @@ public:
, m_openInSplit(openInSplit) , m_openInSplit(openInSplit)
{} {}
bool isFragile() const Q_DECL_OVERRIDE { return true; } bool isFragile() const override { return true; }
IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE IAssistProposalWidget *createWidget() const override
{ return new VirtualFunctionProposalWidget(m_openInSplit); } { return new VirtualFunctionProposalWidget(m_openInSplit); }
private: private:
@@ -128,7 +128,7 @@ public:
: m_params(params) : m_params(params)
{} {}
IAssistProposal *immediateProposal(const AssistInterface *) Q_DECL_OVERRIDE IAssistProposal *immediateProposal(const AssistInterface *) override
{ {
QTC_ASSERT(m_params.function, return 0); QTC_ASSERT(m_params.function, return 0);
@@ -144,7 +144,7 @@ public:
return new VirtualFunctionProposal(m_params.cursorPosition, items, m_params.openInNextSplit); return new VirtualFunctionProposal(m_params.cursorPosition, items, m_params.openInNextSplit);
} }
IAssistProposal *perform(const AssistInterface *assistInterface) Q_DECL_OVERRIDE IAssistProposal *perform(const AssistInterface *assistInterface) override
{ {
delete assistInterface; delete assistInterface;

6
src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
View File

@@ -63,9 +63,9 @@ public:
Parameters params() const { return m_params; } Parameters params() const { return m_params; }
void clearParams() { m_params = Parameters(); } void clearParams() { m_params = Parameters(); }
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;
TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE; TextEditor::IAssistProcessor *createProcessor() const override;
private: private:
Parameters m_params; Parameters m_params;

2
src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
View File

@@ -132,7 +132,7 @@ public:
// Invoke the processor already here to calculate the proposals. Return false in order to // Invoke the processor already here to calculate the proposals. Return false in order to
// indicate that configure failed, so the actual code assist invocation leading to a pop-up // indicate that configure failed, so the actual code assist invocation leading to a pop-up
// will not happen. // will not happen.
bool configure(const VirtualFunctionAssistProvider::Parameters &params) Q_DECL_OVERRIDE bool configure(const VirtualFunctionAssistProvider::Parameters &params) override
{ {
VirtualFunctionAssistProvider::configure(params); VirtualFunctionAssistProvider::configure(params);