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

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

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

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

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

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

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