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/cppeditor/cppvirtualfunctionassistprovider.cpp
View File

@@ -53,7 +53,6 @@
#include <texteditor/texteditorconstants.h>
#include <utils/qtcassert.h>
#include <utils/qtcoverride.h>
using namespace CPlusPlus;
using namespace CppEditor::Internal;
@@ -89,7 +88,7 @@ protected:
return GenericProposalWidget::eventFilter(o, e);
}
void showProposal(const QString &prefix) QTC_OVERRIDE
void showProposal(const QString &prefix) Q_DECL_OVERRIDE
{
GenericProposalModel *proposalModel = model();
if (proposalModel && proposalModel->size() == 1) {
@@ -112,9 +111,9 @@ public:
, m_openInSplit(openInSplit)
{}
bool isFragile() const QTC_OVERRIDE { return true; }
bool isFragile() const Q_DECL_OVERRIDE { return true; }
IAssistProposalWidget *createWidget() const QTC_OVERRIDE
IAssistProposalWidget *createWidget() const Q_DECL_OVERRIDE
{ return new VirtualFunctionProposalWidget(m_openInSplit); }
private:
@@ -128,7 +127,7 @@ public:
: m_params(params)
{}
IAssistProposal *immediateProposal(const TextEditor::AssistInterface *) QTC_OVERRIDE
IAssistProposal *immediateProposal(const TextEditor::AssistInterface *) Q_DECL_OVERRIDE
{
QTC_ASSERT(m_params.function, return 0);
@@ -143,7 +142,7 @@ public:
return new VirtualFunctionProposal(m_params.cursorPosition, items, m_params.openInNextSplit);
}
IAssistProposal *perform(const AssistInterface *assistInterface) QTC_OVERRIDE
IAssistProposal *perform(const AssistInterface *assistInterface) Q_DECL_OVERRIDE
{
delete assistInterface;