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

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

@@ -76,7 +76,6 @@
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/pathchooser.h>
#include <utils/qtcoverride.h>
#include <utils/savedaction.h>
#include <utils/stylehelper.h>
@@ -888,18 +887,18 @@ public:
: m_provider(const_cast<FakeVimCompletionAssistProvider *>(provider))
{}
bool implicitlyApplies() const QTC_OVERRIDE
bool implicitlyApplies() const Q_DECL_OVERRIDE
{
return false;
}
bool prematurelyApplies(const QChar &c) const QTC_OVERRIDE
bool prematurelyApplies(const QChar &c) const Q_DECL_OVERRIDE
{
m_provider->appendNeedle(c);
return text() == m_provider->needle();
}
void applyContextualContent(BaseTextEditorWidget *, int) const QTC_OVERRIDE
void applyContextualContent(BaseTextEditorWidget *, int) const Q_DECL_OVERRIDE
{
QTC_ASSERT(m_provider->handler(), return);
m_provider->handler()->handleReplay(text().mid(m_provider->needle().size()));
@@ -919,7 +918,7 @@ public:
loadContent(items);
}
bool supportsPrefixExpansion() const QTC_OVERRIDE
bool supportsPrefixExpansion() const Q_DECL_OVERRIDE
{
return false;
}
@@ -932,7 +931,7 @@ public:
: m_provider(static_cast<const FakeVimCompletionAssistProvider *>(provider))
{}
IAssistProposal *perform(const AssistInterface *interface) QTC_OVERRIDE
IAssistProposal *perform(const AssistInterface *interface) Q_DECL_OVERRIDE
{
const QString &needle = m_provider->needle();