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

CodeAssistant: Replace virtual with QTC_OVERRIDE

Browse Source 
Change-Id: I18ea4ea410ac811972447e9395f2eef76bda8084
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
Orgad Shaneh
2014-02-17 19:23:20 +02:00
committed by Orgad Shaneh
parent d087d0b66e
commit 91def5a8ff
29 changed files with 227 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,8 @@
#include <cplusplus/LookupContext.h> #include <cplusplus/LookupContext.h>
#include <utils/qtcoverride.h>
namespace CppTools { namespace CppTools {
class CppRefactoringFile; class CppRefactoringFile;
typedef QSharedPointer<CppRefactoringFile> CppRefactoringFilePtr; typedef QSharedPointer<CppRefactoringFile> CppRefactoringFilePtr;
@@ -77,7 +79,7 @@ class CppQuickFixAssistProcessor : public TextEditor::QuickFixAssistProcessor
public: public:
CppQuickFixAssistProcessor(const TextEditor::IAssistProvider *provider); CppQuickFixAssistProcessor(const TextEditor::IAssistProvider *provider);
virtual const TextEditor::IAssistProvider *provider() const; const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
private: private:
const TextEditor::IAssistProvider *m_provider; const TextEditor::IAssistProvider *m_provider;
@@ -86,11 +88,11 @@ private:
class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider class CppQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
{ {
public: public:
virtual bool isAsynchronous() const; bool isAsynchronous() const QTC_OVERRIDE;
virtual bool supportsEditor(const Core::Id &editorId) const; bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
virtual TextEditor::IAssistProcessor *createProcessor() const; TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
virtual QList<TextEditor::QuickFixFactory *> quickFixFactories() const; QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;
}; };
} // Internal } // Internal

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

@@ -53,6 +53,7 @@
#include <texteditor/texteditorconstants.h> #include <texteditor/texteditorconstants.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcoverride.h>
using namespace CPlusPlus; using namespace CPlusPlus;
using namespace CppEditor::Internal; using namespace CppEditor::Internal;
@@ -88,7 +89,7 @@ protected:
return GenericProposalWidget::eventFilter(o, e); return GenericProposalWidget::eventFilter(o, e);
} }
void showProposal(const QString &prefix) void showProposal(const QString &prefix) QTC_OVERRIDE
{ {
IGenericProposalModel *proposalModel = model(); IGenericProposalModel *proposalModel = model();
if (proposalModel && proposalModel->size() == 1) { if (proposalModel && proposalModel->size() == 1) {
@@ -111,9 +112,9 @@ public:
, m_openInSplit(openInSplit) , 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); } { return new VirtualFunctionProposalWidget(m_openInSplit); }
private: private:
@@ -127,7 +128,7 @@ public:
: m_params(params) : m_params(params)
{} {}
IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *) IAssistProposal *immediateProposal(const TextEditor::IAssistInterface *) QTC_OVERRIDE
{ {
QTC_ASSERT(m_params.function, return 0); QTC_ASSERT(m_params.function, return 0);
@@ -144,7 +145,7 @@ public:
m_params.openInNextSplit); m_params.openInNextSplit);
} }
IAssistProposal *perform(const IAssistInterface *) IAssistProposal *perform(const IAssistInterface *) QTC_OVERRIDE
{ {
QTC_ASSERT(m_params.function, return 0); QTC_ASSERT(m_params.function, return 0);
QTC_ASSERT(m_params.staticClass, return 0); QTC_ASSERT(m_params.staticClass, return 0);

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

@@ -36,6 +36,8 @@
#include <cplusplus/Symbols.h> #include <cplusplus/Symbols.h>
#include <cplusplus/TypeOfExpression.h> #include <cplusplus/TypeOfExpression.h>
#include <utils/qtcoverride.h>
#include <QSharedPointer> #include <QSharedPointer>
#include <QTextCursor> #include <QTextCursor>
@@ -62,9 +64,9 @@ public:
Parameters params() const { return m_params; } Parameters params() const { return m_params; }
void clearParams() { m_params = Parameters(); } void clearParams() { m_params = Parameters(); }
bool isAsynchronous() const; bool isAsynchronous() const QTC_OVERRIDE;
bool supportsEditor(const Core::Id &editorId) const; bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
TextEditor::IAssistProcessor *createProcessor() const; TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
private: private:
Parameters m_params; Parameters m_params;

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

@@ -107,7 +107,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) bool configure(const VirtualFunctionAssistProvider::Parameters &params) QTC_OVERRIDE
{ {
VirtualFunctionAssistProvider::configure(params); VirtualFunctionAssistProvider::configure(params);

31
src/plugins/cpptools/cppcompletionassist.cpp
View File

@@ -45,6 +45,7 @@
#include <texteditor/completionsettings.h> #include <texteditor/completionsettings.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcoverride.h>
#include <cplusplus/BackwardsScanner.h> #include <cplusplus/BackwardsScanner.h>
#include <cplusplus/CppRewriter.h> #include <cplusplus/CppRewriter.h>
@@ -85,9 +86,9 @@ public:
CppAssistProposalItem() : CppAssistProposalItem() :
m_isOverloaded(false) {} m_isOverloaded(false) {}
virtual bool prematurelyApplies(const QChar &c) const; bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
virtual void applyContextualContent(TextEditor::BaseTextEditor *editor, void applyContextualContent(TextEditor::BaseTextEditor *editor,
int basePosition) const; int basePosition) const QTC_OVERRIDE;
bool isOverloaded() const { return m_isOverloaded; } bool isOverloaded() const { return m_isOverloaded; }
void markAsOverloaded() { m_isOverloaded = true; } void markAsOverloaded() { m_isOverloaded = true; }
@@ -350,10 +351,10 @@ public:
, m_typeOfExpression(typeOfExp) , m_typeOfExpression(typeOfExp)
{} {}
virtual void reset() {} void reset() QTC_OVERRIDE {}
virtual int size() const { return m_functionSymbols.size(); } int size() const QTC_OVERRIDE { return m_functionSymbols.size(); }
virtual QString text(int index) const; QString text(int index) const QTC_OVERRIDE;
virtual int activeArgument(const QString &prefix) const; int activeArgument(const QString &prefix) const QTC_OVERRIDE;
private: private:
QList<Function *> m_functionSymbols; QList<Function *> m_functionSymbols;
@@ -452,8 +453,8 @@ public:
, m_replaceDotForArrow(static_cast<CppAssistProposalModel *>(model)->m_replaceDotForArrow) , m_replaceDotForArrow(static_cast<CppAssistProposalModel *>(model)->m_replaceDotForArrow)
{} {}
bool isCorrective() const { return m_replaceDotForArrow; } bool isCorrective() const QTC_OVERRIDE { return m_replaceDotForArrow; }
void makeCorrection(BaseTextEditor *editor); void makeCorrection(BaseTextEditor *editor) QTC_OVERRIDE;
private: private:
bool m_replaceDotForArrow; bool m_replaceDotForArrow;
@@ -528,32 +529,32 @@ protected:
return item; return item;
} }
virtual void visit(const Identifier *name) void visit(const Identifier *name)
{ {
_item = newCompletionItem(name); _item = newCompletionItem(name);
if (!_symbol->isScope() || _symbol->isFunction()) if (!_symbol->isScope() || _symbol->isFunction())
_item->setDetail(overview.prettyType(_symbol->type(), name)); _item->setDetail(overview.prettyType(_symbol->type(), name));
} }
virtual void visit(const TemplateNameId *name) void visit(const TemplateNameId *name)
{ {
_item = newCompletionItem(name); _item = newCompletionItem(name);
_item->setText(QLatin1String(name->identifier()->chars())); _item->setText(QLatin1String(name->identifier()->chars()));
} }
virtual void visit(const DestructorNameId *name) void visit(const DestructorNameId *name)
{ _item = newCompletionItem(name); } { _item = newCompletionItem(name); }
virtual void visit(const OperatorNameId *name) void visit(const OperatorNameId *name)
{ {
_item = newCompletionItem(name); _item = newCompletionItem(name);
_item->setDetail(overview.prettyType(_symbol->type(), name)); _item->setDetail(overview.prettyType(_symbol->type(), name));
} }
virtual void visit(const ConversionNameId *name) void visit(const ConversionNameId *name)
{ _item = newCompletionItem(name); } { _item = newCompletionItem(name); }
virtual void visit(const QualifiedNameId *name) void visit(const QualifiedNameId *name)
{ _item = newCompletionItem(name->name()); } { _item = newCompletionItem(name->name()); }
}; };

21
src/plugins/cpptools/cppcompletionassist.h
View File

@@ -44,6 +44,8 @@
#include <texteditor/codeassist/iassistprocessor.h> #include <texteditor/codeassist/iassistprocessor.h>
#include <texteditor/snippets/snippetassistcollector.h> #include <texteditor/snippets/snippetassistcollector.h>
#include <utils/qtcoverride.h>
#include <QStringList> #include <QStringList>
#include <QVariant> #include <QVariant>
@@ -75,8 +77,8 @@ public:
m_typeOfExpression->setExpandTemplates(true); m_typeOfExpression->setExpandTemplates(true);
} }
virtual bool isSortable(const QString &prefix) const; bool isSortable(const QString &prefix) const QTC_OVERRIDE;
virtual TextEditor::IAssistProposalItem *proposalItem(int index) const; TextEditor::IAssistProposalItem *proposalItem(int index) const QTC_OVERRIDE;
unsigned m_completionOperator; unsigned m_completionOperator;
bool m_replaceDotForArrow; bool m_replaceDotForArrow;
@@ -88,11 +90,14 @@ class InternalCompletionAssistProvider : public CppCompletionAssistProvider
Q_OBJECT Q_OBJECT
public: public:
virtual TextEditor::IAssistProcessor *createProcessor() const; TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
virtual TextEditor::IAssistInterface *createAssistInterface( TextEditor::IAssistInterface *createAssistInterface(
ProjectExplorer::Project *project, TextEditor::BaseTextEditor *editor, ProjectExplorer::Project *project,
QTextDocument *document, int position, TextEditor::AssistReason reason) const; TextEditor::BaseTextEditor *editor,
QTextDocument *document,
int position,
TextEditor::AssistReason reason) const QTC_OVERRIDE;
}; };
@@ -100,9 +105,9 @@ class CppCompletionAssistProcessor : public TextEditor::IAssistProcessor
{ {
public: public:
CppCompletionAssistProcessor(); CppCompletionAssistProcessor();
virtual ~CppCompletionAssistProcessor(); ~CppCompletionAssistProcessor();
virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface); TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface) QTC_OVERRIDE;
private: private:
TextEditor::IAssistProposal *createContentProposal(); TextEditor::IAssistProposal *createContentProposal();

8
src/plugins/cpptools/cppcompletionassistprovider.h
View File

@@ -35,6 +35,8 @@
#include <texteditor/codeassist/assistenums.h> #include <texteditor/codeassist/assistenums.h>
#include <texteditor/codeassist/completionassistprovider.h> #include <texteditor/codeassist/completionassistprovider.h>
#include <utils/qtcoverride.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QTextDocument; class QTextDocument;
QT_END_NAMESPACE QT_END_NAMESPACE
@@ -53,9 +55,9 @@ class CPPTOOLS_EXPORT CppCompletionAssistProvider : public TextEditor::Completio
Q_OBJECT Q_OBJECT
public: public:
virtual bool supportsEditor(const Core::Id &editorId) const; bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
virtual int activationCharSequenceLength() const; int activationCharSequenceLength() const QTC_OVERRIDE;
virtual bool isActivationCharSequence(const QString &sequence) const; bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
virtual TextEditor::IAssistInterface *createAssistInterface( virtual TextEditor::IAssistInterface *createAssistInterface(
ProjectExplorer::Project *project, TextEditor::BaseTextEditor *editor, ProjectExplorer::Project *project, TextEditor::BaseTextEditor *editor,

13
src/plugins/fakevim/fakevimplugin.cpp
View File

@@ -73,6 +73,7 @@
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcoverride.h>
#include <utils/savedaction.h> #include <utils/savedaction.h>
#include <utils/stylehelper.h> #include <utils/stylehelper.h>
@@ -894,18 +895,18 @@ public:
: m_provider(const_cast<FakeVimCompletionAssistProvider *>(provider)) : m_provider(const_cast<FakeVimCompletionAssistProvider *>(provider))
{} {}
virtual bool implicitlyApplies() const bool implicitlyApplies() const QTC_OVERRIDE
{ {
return false; return false;
} }
virtual bool prematurelyApplies(const QChar &c) const bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE
{ {
m_provider->appendNeedle(c); m_provider->appendNeedle(c);
return text() == m_provider->needle(); return text() == m_provider->needle();
} }
virtual void applyContextualContent(BaseTextEditor *, int) const void applyContextualContent(BaseTextEditor *, int) const QTC_OVERRIDE
{ {
QTC_ASSERT(m_provider->handler(), return); QTC_ASSERT(m_provider->handler(), return);
m_provider->handler()->handleReplay(text().mid(m_provider->needle().size())); m_provider->handler()->handleReplay(text().mid(m_provider->needle().size()));
@@ -924,7 +925,7 @@ public:
: BasicProposalItemListModel(items) : BasicProposalItemListModel(items)
{} {}
virtual bool supportsPrefixExpansion() const bool supportsPrefixExpansion() const QTC_OVERRIDE
{ {
return false; return false;
} }
@@ -937,7 +938,7 @@ public:
: m_provider(static_cast<const FakeVimCompletionAssistProvider *>(provider)) : m_provider(static_cast<const FakeVimCompletionAssistProvider *>(provider))
{} {}
IAssistProposal *perform(const IAssistInterface *interface) IAssistProposal *perform(const IAssistInterface *interface) QTC_OVERRIDE
{ {
const QString &needle = m_provider->needle(); const QString &needle = m_provider->needle();
@@ -1728,7 +1729,7 @@ public:
: QObject(parent), m_handler(handler) : QObject(parent), m_handler(handler)
{} {}
virtual ~DeferredDeleter() ~DeferredDeleter()
{ {
if (m_handler) { if (m_handler) {
m_handler->disconnectFromEditor(); m_handler->disconnectFromEditor();

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

@@ -46,7 +46,9 @@
#include <texteditor/codeassist/genericproposal.h> #include <texteditor/codeassist/genericproposal.h>
#include <texteditor/codeassist/functionhintproposal.h> #include <texteditor/codeassist/functionhintproposal.h>
#include <cplusplus/ExpressionUnderCursor.h> #include <cplusplus/ExpressionUnderCursor.h>
#include <utils/faketooltip.h> #include <utils/faketooltip.h>
#include <utils/qtcoverride.h>
#include <QIcon> #include <QIcon>
#include <QPainter> #include <QPainter>
@@ -149,10 +151,10 @@ public:
, m_currentArg(-1) , m_currentArg(-1)
{} {}
virtual void reset() {} void reset() QTC_OVERRIDE {}
virtual int size() const { return m_items.size(); } int size() const QTC_OVERRIDE { return m_items.size(); }
virtual QString text(int index) const; QString text(int index) const QTC_OVERRIDE;
virtual int activeArgument(const QString &prefix) const; int activeArgument(const QString &prefix) const QTC_OVERRIDE;
private: private:
QVector<GLSL::Function *> m_items; QVector<GLSL::Function *> m_items;

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

@@ -37,6 +37,8 @@
#include <texteditor/codeassist/defaultassistinterface.h> #include <texteditor/codeassist/defaultassistinterface.h>
#include <texteditor/codeassist/ifunctionhintproposalmodel.h> #include <texteditor/codeassist/ifunctionhintproposalmodel.h>
#include <utils/qtcoverride.h>
#include <QScopedPointer> #include <QScopedPointer>
#include <QIcon> #include <QIcon>
@@ -54,20 +56,20 @@ class GLSLCompletionAssistProvider : public TextEditor::CompletionAssistProvider
Q_OBJECT Q_OBJECT
public: public:
virtual bool supportsEditor(const Core::Id &editorId) const; bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
virtual TextEditor::IAssistProcessor *createProcessor() const; TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
virtual int activationCharSequenceLength() const; int activationCharSequenceLength() const QTC_OVERRIDE;
virtual bool isActivationCharSequence(const QString &sequence) const; bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
}; };
class GLSLCompletionAssistProcessor : public TextEditor::IAssistProcessor class GLSLCompletionAssistProcessor : public TextEditor::IAssistProcessor
{ {
public: public:
GLSLCompletionAssistProcessor(); GLSLCompletionAssistProcessor();
virtual ~GLSLCompletionAssistProcessor(); ~GLSLCompletionAssistProcessor();
virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface); TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface) QTC_OVERRIDE;
private: private:
TextEditor::IAssistProposal *createContentProposal() const; TextEditor::IAssistProposal *createContentProposal() const;

8
src/plugins/qmakeprojectmanager/profilecompletionassist.h
View File

@@ -32,6 +32,8 @@
#include <texteditor/codeassist/completionassistprovider.h> #include <texteditor/codeassist/completionassistprovider.h>
#include <utils/qtcoverride.h>
#include <QStringList> #include <QStringList>
namespace QmakeProjectManager { namespace QmakeProjectManager {
@@ -43,10 +45,10 @@ class ProFileCompletionAssistProvider : public TextEditor::CompletionAssistProvi
public: public:
ProFileCompletionAssistProvider(); ProFileCompletionAssistProvider();
void init(); void init();
virtual ~ProFileCompletionAssistProvider(); ~ProFileCompletionAssistProvider();
virtual bool supportsEditor(const Core::Id &editorId) const; bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
virtual TextEditor::IAssistProcessor *createProcessor() const; TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
QStringList variables() const; QStringList variables() const;
QStringList functions() const; QStringList functions() const;
private: private:

23
src/plugins/qmljseditor/qmljscompletionassist.cpp
View File

@@ -42,6 +42,7 @@
#include <texteditor/completionsettings.h> #include <texteditor/completionsettings.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcoverride.h>
#include <qmljs/qmljsmodelmanagerinterface.h> #include <qmljs/qmljsmodelmanagerinterface.h>
#include <qmljs/parser/qmljsast_p.h> #include <qmljs/parser/qmljsast_p.h>
@@ -136,7 +137,7 @@ public:
, order(order) , order(order)
{} {}
virtual void operator()(const Value *base, const QString &name, const Value *value) void operator()(const Value *base, const QString &name, const Value *value) QTC_OVERRIDE
{ {
Q_UNUSED(base) Q_UNUSED(base)
QVariant data; QVariant data;
@@ -164,7 +165,7 @@ public:
, afterOn(afterOn) , afterOn(afterOn)
{} {}
virtual void operator ()(const Value *base, const QString &name, const Value *) void operator ()(const Value *base, const QString &name, const Value *) QTC_OVERRIDE
{ {
const CppComponentValue *qmlBase = value_cast<CppComponentValue>(base); const CppComponentValue *qmlBase = value_cast<CppComponentValue>(base);
@@ -246,34 +247,34 @@ private:
(*_propertyProcessor)(_currentObject, name, value); (*_propertyProcessor)(_currentObject, name, value);
} }
virtual bool processProperty(const QString &name, const Value *value) bool processProperty(const QString &name, const Value *value) QTC_OVERRIDE
{ {
process(name, value); process(name, value);
return true; return true;
} }
virtual bool processEnumerator(const QString &name, const Value *value) bool processEnumerator(const QString &name, const Value *value) QTC_OVERRIDE
{ {
if (! _globalCompletion) if (! _globalCompletion)
process(name, value); process(name, value);
return true; return true;
} }
virtual bool processSignal(const QString &name, const Value *value) bool processSignal(const QString &name, const Value *value) QTC_OVERRIDE
{ {
if (_globalCompletion) if (_globalCompletion)
process(name, value); process(name, value);
return true; return true;
} }
virtual bool processSlot(const QString &name, const Value *value) bool processSlot(const QString &name, const Value *value) QTC_OVERRIDE
{ {
if (_enumerateSlots) if (_enumerateSlots)
process(name, value); process(name, value);
return true; return true;
} }
virtual bool processGeneratedSlot(const QString &name, const Value *value) bool processGeneratedSlot(const QString &name, const Value *value) QTC_OVERRIDE
{ {
if (_enumerateGeneratedSlots || (_currentObject && _currentObject->className().endsWith(QLatin1String("Keys")))) { if (_enumerateGeneratedSlots || (_currentObject && _currentObject->className().endsWith(QLatin1String("Keys")))) {
// ### FIXME: add support for attached properties. // ### FIXME: add support for attached properties.
@@ -404,10 +405,10 @@ public:
, m_isVariadic(isVariadic) , m_isVariadic(isVariadic)
{} {}
virtual void reset() {} void reset() QTC_OVERRIDE {}
virtual int size() const { return 1; } int size() const QTC_OVERRIDE { return 1; }
virtual QString text(int index) const; QString text(int index) const QTC_OVERRIDE;
virtual int activeArgument(const QString &prefix) const; int activeArgument(const QString &prefix) const QTC_OVERRIDE;
private: private:
QString m_functionName; QString m_functionName;

28
src/plugins/qmljseditor/qmljscompletionassist.h
View File

@@ -39,6 +39,8 @@
#include <texteditor/snippets/snippetassistcollector.h> #include <texteditor/snippets/snippetassistcollector.h>
#include <texteditor/codeassist/defaultassistinterface.h> #include <texteditor/codeassist/defaultassistinterface.h>
#include <utils/qtcoverride.h>
#include <QStringList> #include <QStringList>
#include <QScopedPointer> #include <QScopedPointer>
#include <QVariant> #include <QVariant>
@@ -54,9 +56,9 @@ class QmlJSCompletionAssistInterface;
class QmlJSAssistProposalItem : public TextEditor::BasicProposalItem class QmlJSAssistProposalItem : public TextEditor::BasicProposalItem
{ {
public: public:
virtual bool prematurelyApplies(const QChar &c) const; bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
virtual void applyContextualContent(TextEditor::BaseTextEditor *editor, void applyContextualContent(TextEditor::BaseTextEditor *editor,
int basePosition) const; int basePosition) const QTC_OVERRIDE;
}; };
@@ -67,9 +69,9 @@ public:
: TextEditor::BasicProposalItemListModel(items) : TextEditor::BasicProposalItemListModel(items)
{} {}
virtual void filter(const QString &prefix); void filter(const QString &prefix) QTC_OVERRIDE;
virtual void sort(const QString &prefix); void sort(const QString &prefix) QTC_OVERRIDE;
virtual bool keepPerfectMatch(TextEditor::AssistReason reason) const; bool keepPerfectMatch(TextEditor::AssistReason reason) const QTC_OVERRIDE;
}; };
@@ -78,12 +80,12 @@ class QmlJSCompletionAssistProvider : public TextEditor::CompletionAssistProvide
Q_OBJECT Q_OBJECT
public: public:
virtual bool supportsEditor(const Core::Id &editorId) const; bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
virtual TextEditor::IAssistProcessor *createProcessor() const; TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
virtual int activationCharSequenceLength() const; int activationCharSequenceLength() const QTC_OVERRIDE;
virtual bool isActivationCharSequence(const QString &sequence) const; bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
virtual bool isContinuationChar(const QChar &c) const; bool isContinuationChar(const QChar &c) const QTC_OVERRIDE;
}; };
@@ -91,9 +93,9 @@ class QmlJSCompletionAssistProcessor : public TextEditor::IAssistProcessor
{ {
public: public:
QmlJSCompletionAssistProcessor(); QmlJSCompletionAssistProcessor();
virtual ~QmlJSCompletionAssistProcessor(); ~QmlJSCompletionAssistProcessor();
virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface); TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface) QTC_OVERRIDE;
private: private:
TextEditor::IAssistProposal *createContentProposal() const; TextEditor::IAssistProposal *createContentProposal() const;

18
src/plugins/qmljseditor/qmljsquickfixassist.h
View File

@@ -38,6 +38,8 @@
#include <texteditor/codeassist/quickfixassistprovider.h> #include <texteditor/codeassist/quickfixassistprovider.h>
#include <texteditor/codeassist/quickfixassistprocessor.h> #include <texteditor/codeassist/quickfixassistprocessor.h>
#include <utils/qtcoverride.h>
namespace QmlJSEditor { namespace QmlJSEditor {
namespace Internal { namespace Internal {
@@ -45,7 +47,7 @@ class QmlJSQuickFixAssistInterface : public TextEditor::DefaultAssistInterface
{ {
public: public:
QmlJSQuickFixAssistInterface(QmlJSTextEditorWidget *editor, TextEditor::AssistReason reason); QmlJSQuickFixAssistInterface(QmlJSTextEditorWidget *editor, TextEditor::AssistReason reason);
virtual ~QmlJSQuickFixAssistInterface(); ~QmlJSQuickFixAssistInterface();
const QmlJSTools::SemanticInfo &semanticInfo() const; const QmlJSTools::SemanticInfo &semanticInfo() const;
QmlJSTools::QmlJSRefactoringFilePtr currentFile() const; QmlJSTools::QmlJSRefactoringFilePtr currentFile() const;
@@ -60,9 +62,9 @@ class QmlJSQuickFixProcessor : public TextEditor::QuickFixAssistProcessor
{ {
public: public:
QmlJSQuickFixProcessor(const TextEditor::IAssistProvider *provider); QmlJSQuickFixProcessor(const TextEditor::IAssistProvider *provider);
virtual ~QmlJSQuickFixProcessor(); ~QmlJSQuickFixProcessor();
virtual const TextEditor::IAssistProvider *provider() const; const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
private: private:
const TextEditor::IAssistProvider *m_provider; const TextEditor::IAssistProvider *m_provider;
@@ -73,13 +75,13 @@ class QmlJSQuickFixAssistProvider : public TextEditor::QuickFixAssistProvider
{ {
public: public:
QmlJSQuickFixAssistProvider(); QmlJSQuickFixAssistProvider();
virtual ~QmlJSQuickFixAssistProvider(); ~QmlJSQuickFixAssistProvider();
virtual bool isAsynchronous() const; bool isAsynchronous() const QTC_OVERRIDE;
virtual bool supportsEditor(const Core::Id &editorId) const; bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
virtual TextEditor::IAssistProcessor *createProcessor() const; TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
virtual QList<TextEditor::QuickFixFactory *> quickFixFactories() const; QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;
}; };
} // Internal } // Internal

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

@@ -39,6 +39,8 @@
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <utils/qtcoverride.h>
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
@@ -62,7 +64,7 @@ public:
setText(text); setText(text);
} }
virtual void apply(BaseTextEditor *editor, int /*basePosition*/) const void apply(BaseTextEditor *editor, int /*basePosition*/) const QTC_OVERRIDE
{ {
BaseTextEditorWidget *editwidget = editor->editorWidget(); BaseTextEditorWidget *editwidget = editor->editorWidget();
@@ -87,7 +89,7 @@ private:
class ClipboardAssistProcessor: public IAssistProcessor class ClipboardAssistProcessor: public IAssistProcessor
{ {
public: public:
IAssistProposal *perform(const IAssistInterface *interface) IAssistProposal *perform(const IAssistInterface *interface) QTC_OVERRIDE
{ {
if (!interface) if (!interface)
return 0; return 0;

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

@@ -32,6 +32,8 @@
#include "codeassist/iassistprovider.h" #include "codeassist/iassistprovider.h"
#include <utils/qtcoverride.h>
namespace TextEditor { namespace TextEditor {
namespace Internal { namespace Internal {
@@ -39,8 +41,8 @@ class ClipboardAssistProvider: public IAssistProvider
{ {
public: public:
bool isAsynchronous() const; bool isAsynchronous() const;
virtual bool supportsEditor(const Core::Id &editorId) const; bool supportsEditor(const Core::Id &editorId) const QTC_OVERRIDE;
virtual IAssistProcessor *createProcessor() const; IAssistProcessor *createProcessor() const QTC_OVERRIDE;
}; };
} // namespace Internal } // namespace Internal

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

@@ -34,6 +34,8 @@
#include <texteditor/texteditor_global.h> #include <texteditor/texteditor_global.h>
#include <utils/qtcoverride.h>
#include <QVariant> #include <QVariant>
#include <QIcon> #include <QIcon>
@@ -43,13 +45,13 @@ class TEXTEDITOR_EXPORT BasicProposalItem : public IAssistProposalItem
{ {
public: public:
BasicProposalItem(); BasicProposalItem();
virtual ~BasicProposalItem(); ~BasicProposalItem();
void setIcon(const QIcon &icon); void setIcon(const QIcon &icon);
const QIcon &icon() const; const QIcon &icon() const;
void setText(const QString &text); void setText(const QString &text);
virtual QString text() const; QString text() const QTC_OVERRIDE;
void setDetail(const QString &detail); void setDetail(const QString &detail);
const QString &detail() const; const QString &detail() const;
@@ -60,9 +62,9 @@ public:
int order() const; int order() const;
void setOrder(int order); void setOrder(int order);
virtual bool implicitlyApplies() const; bool implicitlyApplies() const QTC_OVERRIDE;
virtual bool prematurelyApplies(const QChar &c) const; bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
virtual void apply(BaseTextEditor *editor, int basePosition) const; void apply(BaseTextEditor *editor, int basePosition) const QTC_OVERRIDE;
virtual void applyContextualContent(BaseTextEditor *editor, int basePosition) const; virtual void applyContextualContent(BaseTextEditor *editor, int basePosition) const;
virtual void applySnippet(BaseTextEditor *editor, int basePosition) const; virtual void applySnippet(BaseTextEditor *editor, int basePosition) const;
virtual void applyQuickFix(BaseTextEditor *editor, int basePosition) const; virtual void applyQuickFix(BaseTextEditor *editor, int basePosition) const;

32
src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
View File

@@ -34,6 +34,8 @@
#include <texteditor/texteditor_global.h> #include <texteditor/texteditor_global.h>
#include <utils/qtcoverride.h>
#include <QList> #include <QList>
#include <QHash> #include <QHash>
#include <QPair> #include <QPair>
@@ -47,22 +49,22 @@ class TEXTEDITOR_EXPORT BasicProposalItemListModel : public IGenericProposalMode
public: public:
BasicProposalItemListModel(); BasicProposalItemListModel();
BasicProposalItemListModel(const QList<BasicProposalItem *> &items); BasicProposalItemListModel(const QList<BasicProposalItem *> &items);
virtual ~BasicProposalItemListModel(); ~BasicProposalItemListModel();
virtual void reset(); void reset() QTC_OVERRIDE;
virtual int size() const; int size() const QTC_OVERRIDE;
virtual QString text(int index) const; QString text(int index) const QTC_OVERRIDE;
virtual QIcon icon(int index) const; QIcon icon(int index) const QTC_OVERRIDE;
virtual QString detail(int index) const; QString detail(int index) const QTC_OVERRIDE;
virtual int persistentId(int index) const; int persistentId(int index) const QTC_OVERRIDE;
virtual void removeDuplicates(); void removeDuplicates() QTC_OVERRIDE;
virtual void filter(const QString &prefix); void filter(const QString &prefix) QTC_OVERRIDE;
virtual bool isSortable(const QString &prefix) const; bool isSortable(const QString &prefix) const QTC_OVERRIDE;
virtual void sort(const QString &prefix); void sort(const QString &prefix) QTC_OVERRIDE;
virtual bool supportsPrefixExpansion() const; bool supportsPrefixExpansion() const QTC_OVERRIDE;
virtual QString proposalPrefix() const; QString proposalPrefix() const QTC_OVERRIDE;
virtual bool keepPerfectMatch(AssistReason reason) const; bool keepPerfectMatch(AssistReason reason) const QTC_OVERRIDE;
virtual IAssistProposalItem *proposalItem(int index) const; IAssistProposalItem *proposalItem(int index) const QTC_OVERRIDE;
void loadContent(const QList<BasicProposalItem *> &items); void loadContent(const QList<BasicProposalItem *> &items);
void setSortingAllowed(bool isAllowed); void setSortingAllowed(bool isAllowed);

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

@@ -32,6 +32,8 @@
#include "iassistprovider.h" #include "iassistprovider.h"
#include <utils/qtcoverride.h>
namespace TextEditor { namespace TextEditor {
class TEXTEDITOR_EXPORT CompletionAssistProvider : public IAssistProvider class TEXTEDITOR_EXPORT CompletionAssistProvider : public IAssistProvider
@@ -40,9 +42,9 @@ class TEXTEDITOR_EXPORT CompletionAssistProvider : public IAssistProvider
public: public:
CompletionAssistProvider(); CompletionAssistProvider();
virtual ~CompletionAssistProvider(); ~CompletionAssistProvider();
virtual bool isAsynchronous() const; bool isAsynchronous() const QTC_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;

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

@@ -32,6 +32,8 @@
#include "iassistinterface.h" #include "iassistinterface.h"
#include <utils/qtcoverride.h>
namespace TextEditor { namespace TextEditor {
class TEXTEDITOR_EXPORT DefaultAssistInterface : public IAssistInterface class TEXTEDITOR_EXPORT DefaultAssistInterface : public IAssistInterface
@@ -41,16 +43,16 @@ public:
int position, int position,
const QString &fileName, const QString &fileName,
AssistReason reason); AssistReason reason);
virtual ~DefaultAssistInterface(); ~DefaultAssistInterface();
virtual int position() const { return m_position; } int position() const QTC_OVERRIDE { return m_position; }
virtual QChar characterAt(int position) const; QChar characterAt(int position) const QTC_OVERRIDE;
virtual QString textAt(int position, int length) const; QString textAt(int position, int length) const QTC_OVERRIDE;
virtual QString fileName() const { return m_fileName; } QString fileName() const QTC_OVERRIDE { return m_fileName; }
virtual QTextDocument *textDocument() const { return m_textDocument; } QTextDocument *textDocument() const QTC_OVERRIDE { return m_textDocument; }
virtual void prepareForAsyncUse(); void prepareForAsyncUse() QTC_OVERRIDE;
virtual void recreateTextDocument(); void recreateTextDocument() QTC_OVERRIDE;
virtual AssistReason reason() const; AssistReason reason() const QTC_OVERRIDE;
private: private:
QTextDocument *m_textDocument; QTextDocument *m_textDocument;

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

@@ -32,6 +32,8 @@
#include "iassistproposal.h" #include "iassistproposal.h"
#include <utils/qtcoverride.h>
namespace TextEditor { namespace TextEditor {
class IFunctionHintProposalModel; class IFunctionHintProposalModel;
@@ -40,14 +42,14 @@ class TEXTEDITOR_EXPORT FunctionHintProposal : public IAssistProposal
{ {
public: public:
FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model); FunctionHintProposal(int cursorPos, IFunctionHintProposalModel *model);
virtual ~FunctionHintProposal(); ~FunctionHintProposal();
bool isFragile() const; bool isFragile() const QTC_OVERRIDE;
int basePosition() const; int basePosition() const QTC_OVERRIDE;
bool isCorrective() const; bool isCorrective() const QTC_OVERRIDE;
void makeCorrection(BaseTextEditor *editor); void makeCorrection(BaseTextEditor *editor) QTC_OVERRIDE;
IAssistProposalModel *model() const; IAssistProposalModel *model() const QTC_OVERRIDE;
IAssistProposalWidget *createWidget() const; IAssistProposalWidget *createWidget() const QTC_OVERRIDE;
private: private:
int m_basePosition; int m_basePosition;

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

@@ -32,6 +32,8 @@
#include "iassistproposalwidget.h" #include "iassistproposalwidget.h"
#include <utils/qtcoverride.h>
namespace TextEditor { namespace TextEditor {
struct FunctionHintProposalWidgetPrivate; struct FunctionHintProposalWidgetPrivate;
@@ -42,22 +44,22 @@ class TEXTEDITOR_EXPORT FunctionHintProposalWidget : public IAssistProposalWidge
public: public:
FunctionHintProposalWidget(); FunctionHintProposalWidget();
virtual ~FunctionHintProposalWidget(); ~FunctionHintProposalWidget();
virtual void setAssistant(CodeAssistant *assistant); void setAssistant(CodeAssistant *assistant) QTC_OVERRIDE;
virtual void setReason(AssistReason reason); void setReason(AssistReason reason) QTC_OVERRIDE;
virtual void setKind(AssistKind kind); void setKind(AssistKind kind) QTC_OVERRIDE;
virtual void setUnderlyingWidget(const QWidget *underlyingWidget); void setUnderlyingWidget(const QWidget *underlyingWidget) QTC_OVERRIDE;
virtual void setModel(IAssistProposalModel *model); void setModel(IAssistProposalModel *model) QTC_OVERRIDE;
virtual void setDisplayRect(const QRect &rect); void setDisplayRect(const QRect &rect) QTC_OVERRIDE;
virtual void setIsSynchronized(bool isSync); void setIsSynchronized(bool isSync) QTC_OVERRIDE;
virtual void showProposal(const QString &prefix); void showProposal(const QString &prefix) QTC_OVERRIDE;
virtual void updateProposal(const QString &prefix); void updateProposal(const QString &prefix) QTC_OVERRIDE;
virtual void closeProposal(); void closeProposal() QTC_OVERRIDE;
protected: protected:
virtual bool eventFilter(QObject *o, QEvent *e); bool eventFilter(QObject *o, QEvent *e) QTC_OVERRIDE;
private slots: private slots:
void nextPage(); void nextPage();

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

@@ -32,6 +32,8 @@
#include "iassistproposal.h" #include "iassistproposal.h"
#include <utils/qtcoverride.h>
namespace TextEditor { namespace TextEditor {
class IGenericProposalModel; class IGenericProposalModel;
@@ -42,12 +44,12 @@ public:
GenericProposal(int cursorPos, IGenericProposalModel *model); GenericProposal(int cursorPos, IGenericProposalModel *model);
~GenericProposal(); ~GenericProposal();
bool isFragile() const; bool isFragile() const QTC_OVERRIDE;
int basePosition() const; int basePosition() const QTC_OVERRIDE;
bool isCorrective() const; bool isCorrective() const QTC_OVERRIDE;
void makeCorrection(BaseTextEditor *editor); void makeCorrection(BaseTextEditor *editor) QTC_OVERRIDE;
IAssistProposalModel *model() const; IAssistProposalModel *model() const QTC_OVERRIDE;
IAssistProposalWidget *createWidget() const; IAssistProposalWidget *createWidget() const QTC_OVERRIDE;
protected: protected:
void moveBasePosition(int length); void moveBasePosition(int length);

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

@@ -34,6 +34,8 @@
#include <texteditor/texteditor_global.h> #include <texteditor/texteditor_global.h>
#include <utils/qtcoverride.h>
namespace TextEditor { namespace TextEditor {
class GenericProposalWidgetPrivate; class GenericProposalWidgetPrivate;
@@ -48,17 +50,17 @@ public:
GenericProposalWidget(); GenericProposalWidget();
~GenericProposalWidget(); ~GenericProposalWidget();
void setAssistant(CodeAssistant *assistant); void setAssistant(CodeAssistant *assistant) QTC_OVERRIDE;
void setReason(AssistReason reason); void setReason(AssistReason reason) QTC_OVERRIDE;
void setKind(AssistKind kind); void setKind(AssistKind kind) QTC_OVERRIDE;
void setUnderlyingWidget(const QWidget *underlyingWidget); void setUnderlyingWidget(const QWidget *underlyingWidget) QTC_OVERRIDE;
void setModel(IAssistProposalModel *model); void setModel(IAssistProposalModel *model) QTC_OVERRIDE;
void setDisplayRect(const QRect &rect); void setDisplayRect(const QRect &rect) QTC_OVERRIDE;
void setIsSynchronized(bool isSync); void setIsSynchronized(bool isSync) QTC_OVERRIDE;
void showProposal(const QString &prefix); void showProposal(const QString &prefix) QTC_OVERRIDE;
void updateProposal(const QString &prefix); void updateProposal(const QString &prefix) QTC_OVERRIDE;
void closeProposal(); void closeProposal() QTC_OVERRIDE;
private: private:
bool updateAndCheck(const QString &prefix); bool updateAndCheck(const QString &prefix);

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

@@ -40,7 +40,7 @@ class TEXTEDITOR_EXPORT IFunctionHintProposalModel : public IAssistProposalModel
{ {
public: public:
IFunctionHintProposalModel(); IFunctionHintProposalModel();
virtual ~IFunctionHintProposalModel(); ~IFunctionHintProposalModel();
virtual int activeArgument(const QString &prefix) const = 0; virtual int activeArgument(const QString &prefix) const = 0;
}; };

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

@@ -45,7 +45,7 @@ class TEXTEDITOR_EXPORT IGenericProposalModel : public IAssistProposalModel
{ {
public: public:
IGenericProposalModel(); IGenericProposalModel();
virtual ~IGenericProposalModel(); ~IGenericProposalModel();
virtual QIcon icon(int index) const = 0; virtual QIcon icon(int index) const = 0;
virtual QString detail(int index) const = 0; virtual QString detail(int index) const = 0;

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

@@ -34,6 +34,8 @@
#include "basicproposalitem.h" #include "basicproposalitem.h"
#include "ifunctionhintproposalmodel.h" #include "ifunctionhintproposalmodel.h"
#include <utils/qtcoverride.h>
namespace TextEditor { namespace TextEditor {
class TEXTEDITOR_EXPORT Keywords class TEXTEDITOR_EXPORT Keywords
@@ -58,11 +60,11 @@ class TEXTEDITOR_EXPORT KeywordsAssistProposalItem : public TextEditor::BasicPro
{ {
public: public:
KeywordsAssistProposalItem(Keywords keywords); KeywordsAssistProposalItem(Keywords keywords);
virtual ~KeywordsAssistProposalItem(); ~KeywordsAssistProposalItem();
virtual bool prematurelyApplies(const QChar &c) const; bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
virtual void applyContextualContent(TextEditor::BaseTextEditor *editor, void applyContextualContent(TextEditor::BaseTextEditor *editor,
int basePosition) const; int basePosition) const QTC_OVERRIDE;
private: private:
Keywords m_keywords; Keywords m_keywords;
}; };
@@ -71,12 +73,12 @@ class TEXTEDITOR_EXPORT KeywordsFunctionHintModel : public TextEditor::IFunction
{ {
public: public:
KeywordsFunctionHintModel(const QStringList &functionSymbols); KeywordsFunctionHintModel(const QStringList &functionSymbols);
virtual ~KeywordsFunctionHintModel(); ~KeywordsFunctionHintModel();
virtual void reset(); void reset() QTC_OVERRIDE;
virtual int size() const; int size() const QTC_OVERRIDE;
virtual QString text(int index) const; QString text(int index) const QTC_OVERRIDE;
virtual int activeArgument(const QString &prefix) const; int activeArgument(const QString &prefix) const QTC_OVERRIDE;
private: private:
QStringList m_functionSymbols; QStringList m_functionSymbols;
@@ -86,10 +88,10 @@ class TEXTEDITOR_EXPORT KeywordsCompletionAssistProcessor : public TextEditor::I
{ {
public: public:
KeywordsCompletionAssistProcessor(Keywords keywords); KeywordsCompletionAssistProcessor(Keywords keywords);
virtual ~KeywordsCompletionAssistProcessor(); ~KeywordsCompletionAssistProcessor();
virtual TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface); TextEditor::IAssistProposal *perform(const TextEditor::IAssistInterface *interface) QTC_OVERRIDE;
virtual QChar startOfCommentChar() const; QChar startOfCommentChar() const;
private: private:
bool acceptsIdleEditor(); bool acceptsIdleEditor();

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

@@ -32,17 +32,19 @@
#include "iassistprocessor.h" #include "iassistprocessor.h"
#include <utils/qtcoverride.h>
namespace TextEditor { namespace TextEditor {
class TEXTEDITOR_EXPORT QuickFixAssistProcessor : public IAssistProcessor class TEXTEDITOR_EXPORT QuickFixAssistProcessor : public IAssistProcessor
{ {
public: public:
QuickFixAssistProcessor(); QuickFixAssistProcessor();
virtual ~QuickFixAssistProcessor(); ~QuickFixAssistProcessor();
virtual const IAssistProvider *provider() const = 0; virtual const IAssistProvider *provider() const = 0;
virtual IAssistProposal *perform(const IAssistInterface *interface); IAssistProposal *perform(const IAssistInterface *interface) QTC_OVERRIDE;
}; };
} // TextEditor } // TextEditor

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

@@ -44,7 +44,7 @@ class TEXTEDITOR_EXPORT QuickFixAssistProvider : public IAssistProvider
public: public:
QuickFixAssistProvider(); QuickFixAssistProvider();
virtual ~QuickFixAssistProvider(); ~QuickFixAssistProvider();
virtual QList<QuickFixFactory *> quickFixFactories() const; virtual QList<QuickFixFactory *> quickFixFactories() const;
}; };