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

Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE

Browse Source 
This patch removes src/libs/utils/qtcoverride.h
and uses Q_DECL_OVERRIDE from Qt 5 instead.

Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Thomas Hartmann
2014-09-24 12:49:32 +02:00
parent 652c53bf06
commit 48f19e925b
100 changed files with 985 additions and 1100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -39,7 +39,6 @@
#include <texteditor/snippets/snippetassistcollector.h>
#include <texteditor/codeassist/assistinterface.h>
#include <utils/qtcoverride.h>
#include <QStringList>
#include <QScopedPointer>
@@ -56,9 +55,9 @@ class QmlJSCompletionAssistInterface;
class QmlJSAssistProposalItem : public TextEditor::AssistProposalItem
{
public:
bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE;
bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE;
void applyContextualContent(TextEditor::BaseTextEditorWidget *editorWidget,
int basePosition) const QTC_OVERRIDE;
int basePosition) const Q_DECL_OVERRIDE;
};
@@ -70,9 +69,9 @@ public:
loadContent(items);
}
void filter(const QString &prefix) QTC_OVERRIDE;
void sort(const QString &prefix) QTC_OVERRIDE;
bool keepPerfectMatch(TextEditor::AssistReason reason) const QTC_OVERRIDE;
void filter(const QString &prefix) Q_DECL_OVERRIDE;
void sort(const QString &prefix) Q_DECL_OVERRIDE;
bool keepPerfectMatch(TextEditor::AssistReason reason) const Q_DECL_OVERRIDE;
};
@@ -81,12 +80,12 @@ class QmlJSCompletionAssistProvider : public TextEditor::CompletionAssistProvide
Q_OBJECT
public:
bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
int activationCharSequenceLength() const QTC_OVERRIDE;
bool isActivationCharSequence(const QString &sequence) const QTC_OVERRIDE;
bool isContinuationChar(const QChar &c) const QTC_OVERRIDE;
int activationCharSequenceLength() const Q_DECL_OVERRIDE;
bool isActivationCharSequence(const QString &sequence) const Q_DECL_OVERRIDE;
bool isContinuationChar(const QChar &c) const Q_DECL_OVERRIDE;
};
@@ -96,7 +95,7 @@ public:
QmlJSCompletionAssistProcessor();
~QmlJSCompletionAssistProcessor();
TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) QTC_OVERRIDE;
TextEditor::IAssistProposal *perform(const TextEditor::AssistInterface *interface) Q_DECL_OVERRIDE;
private:
TextEditor::IAssistProposal *createContentProposal() const;

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

@@ -38,7 +38,6 @@
#include <texteditor/codeassist/quickfixassistprovider.h>
#include <texteditor/codeassist/quickfixassistprocessor.h>
#include <utils/qtcoverride.h>
namespace QmlJSEditor {
namespace Internal {
@@ -64,7 +63,7 @@ public:
QmlJSQuickFixProcessor(const TextEditor::IAssistProvider *provider);
~QmlJSQuickFixProcessor();
const TextEditor::IAssistProvider *provider() const QTC_OVERRIDE;
const TextEditor::IAssistProvider *provider() const Q_DECL_OVERRIDE;
private:
const TextEditor::IAssistProvider *m_provider;
@@ -77,11 +76,11 @@ public:
QmlJSQuickFixAssistProvider();
~QmlJSQuickFixAssistProvider();
bool isAsynchronous() const QTC_OVERRIDE;
bool supportsEditor(Core::Id editorId) const QTC_OVERRIDE;
TextEditor::IAssistProcessor *createProcessor() const QTC_OVERRIDE;
bool isAsynchronous() const Q_DECL_OVERRIDE;
bool supportsEditor(Core::Id editorId) const Q_DECL_OVERRIDE;
TextEditor::IAssistProcessor *createProcessor() const Q_DECL_OVERRIDE;
QList<TextEditor::QuickFixFactory *> quickFixFactories() const QTC_OVERRIDE;
QList<TextEditor::QuickFixFactory *> quickFixFactories() const Q_DECL_OVERRIDE;
};
} // Internal