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

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

@@ -42,6 +42,7 @@
#include <texteditor/completionsettings.h>
#include <utils/qtcassert.h>
#include <utils/qtcoverride.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <qmljs/parser/qmljsast_p.h>
@@ -136,7 +137,7 @@ public:
, 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)
QVariant data;
@@ -164,7 +165,7 @@ public:
, 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);
@@ -246,34 +247,34 @@ private:
(*_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);
return true;
}
virtual bool processEnumerator(const QString &name, const Value *value)
bool processEnumerator(const QString &name, const Value *value) QTC_OVERRIDE
{
if (! _globalCompletion)
process(name, value);
return true;
}
virtual bool processSignal(const QString &name, const Value *value)
bool processSignal(const QString &name, const Value *value) QTC_OVERRIDE
{
if (_globalCompletion)
process(name, value);
return true;
}
virtual bool processSlot(const QString &name, const Value *value)
bool processSlot(const QString &name, const Value *value) QTC_OVERRIDE
{
if (_enumerateSlots)
process(name, value);
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")))) {
// ### FIXME: add support for attached properties.
@@ -404,10 +405,10 @@ public:
, m_isVariadic(isVariadic)
{}
virtual void reset() {}
virtual int size() const { return 1; }
virtual QString text(int index) const;
virtual int activeArgument(const QString &prefix) const;
void reset() QTC_OVERRIDE {}
int size() const QTC_OVERRIDE { return 1; }
QString text(int index) const QTC_OVERRIDE;
int activeArgument(const QString &prefix) const QTC_OVERRIDE;
private:
QString m_functionName;

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

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

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

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