aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/cppeditor
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2014-02-17 19:23:20 +0200
committerOrgad Shaneh <orgads@gmail.com>2014-02-17 21:22:21 +0100
commit91def5a8ff91818ad623d3400e70f57717a1b78a (patch)
treeb7efa041c51a61f097e1811c393dcbf3ddcfc8af /src/plugins/cppeditor
parentd087d0b66ec1b865a393730a84b7534dde26820a (diff)
CodeAssistant: Replace virtual with QTC_OVERRIDE
Change-Id: I18ea4ea410ac811972447e9395f2eef76bda8084 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src/plugins/cppeditor')
-rw-r--r--src/plugins/cppeditor/cppquickfixassistant.h12
-rw-r--r--src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp11
-rw-r--r--src/plugins/cppeditor/cppvirtualfunctionassistprovider.h8
-rw-r--r--src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp2
4 files changed, 19 insertions, 14 deletions
diff --git a/src/plugins/cppeditor/cppquickfixassistant.h b/src/plugins/cppeditor/cppquickfixassistant.h
index 4b47df0d22..f7e097c319 100644
--- a/src/plugins/cppeditor/cppquickfixassistant.h
+++ b/src/plugins/cppeditor/cppquickfixassistant.h
@@ -37,6 +37,8 @@
#include <cplusplus/LookupContext.h>
+#include <utils/qtcoverride.h>
+
namespace CppTools {
class CppRefactoringFile;
typedef QSharedPointer<CppRefactoringFile> CppRefactoringFilePtr;
@@ -77,7 +79,7 @@ class CppQuickFixAssistProcessor : public TextEditor::QuickFixAssistProcessor
public:
CppQuickFixAssistProcessor(const TextEditor::IAssistProvider *provider);
- virtual const TextEditor::IAssistProvider *provider() const;
+ const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
private:
const TextEditor::IAssistProvider *m_provider;
@@ -86,11 +88,11 @@ private:
class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
{
public:
- virtual bool isAsynchronous() const;
- virtual bool supportsEditor(const Core::Id &editorId) const;
- virtual TextEditor::IAssistProcessor *createProcessor() const;
+ bool isAsynchronous() const QTC_OVERRIDE;
+ bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
+ TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
- virtual QList<TextEditor::QuickFixFactory *> quickFixFactories() const;
+ QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;
};
} // Internal
diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
index 75635d2f2b..5e3ffac4e7 100644
--- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
+++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.cpp
@@ -53,6 +53,7 @@
#include <texteditor/texteditorconstants.h>
#include <utils/qtcassert.h>
+#include <utils/qtcoverride.h>
using namespace CPlusPlus;
using namespace CppEditor::Internal;
@@ -88,7 +89,7 @@ protected:
return GenericProposalWidget::eventFilter(o, e);
}
- void showProposal(const QString &prefix)
+ void showProposal(const QString &prefix) QTC_OVERRIDE
{
IGenericProposalModel *proposalModel = model();
if (proposalModel && proposalModel->size() == 1) {
@@ -111,9 +112,9 @@ public:
, m_openInSplit(openInSplit)
{}
- bool isFragile() const { return true; }
+ bool isFragile() const QTC_OVERRIDE { return true; }
- IAssistProposalWidget *createWidget() const
+ IAssistProposalWidget *createWidget() const QTC_OVERRIDE
{ return new VirtualFunctionProposalWidget(m_openInSplit); }
private:
@@ -127,7 +128,7 @@ public:
: m_params(params)
{}
- IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *)
+ IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *) QTC_OVERRIDE
{
QTC_ASSERT(m_params.function, return 0);
@@ -144,7 +145,7 @@ public:
m_params.openInNextSplit);
}
- IAssistProposal *perform(const IAssistInterface *)
+ IAssistProposal *perform(const IAssistInterface *) QTC_OVERRIDE
{
QTC_ASSERT(m_params.function, return 0);
QTC_ASSERT(m_params.staticClass, return 0);
diff --git a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
index 45d6245ca7..2841799334 100644
--- a/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
+++ b/src/plugins/cppeditor/cppvirtualfunctionassistprovider.h
@@ -36,6 +36,8 @@
#include <cplusplus/Symbols.h>
#include <cplusplus/TypeOfExpression.h>
+#include <utils/qtcoverride.h>
+
#include <QSharedPointer>
#include <QTextCursor>
@@ -62,9 +64,9 @@ public:
Parameters params() const { return m_params; }
void clearParams() { m_params = Parameters(); }
- bool isAsynchronous() const;
- bool supportsEditor(const Core::Id &editorId) const;
- TextEditor::IAssistProcessor *createProcessor() const;
+ bool isAsynchronous() const QTC_OVERRIDE;
+ bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
+ TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
private:
Parameters m_params;
diff --git a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
index 7bbc5af257..4d5c4a5db7 100644
--- a/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
+++ b/src/plugins/cppeditor/followsymbol_switchmethoddecldef_test.cpp
@@ -107,7 +107,7 @@ public:
// 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
// will not happen.
- bool configure(const VirtualFunctionAssistProvider::Parameters &params)
+ bool configure(const VirtualFunctionAssistProvider::Parameters &params) QTC_OVERRIDE
{
VirtualFunctionAssistProvider::configure(params);