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

9
src/plugins/glsleditor/glslcompletionassist.cpp
View File

@@ -47,7 +47,6 @@
#include <cplusplus/ExpressionUnderCursor.h>
#include <utils/faketooltip.h>
#include <utils/qtcoverride.h>
#include <QIcon>
#include <QPainter>
@@ -177,10 +176,10 @@ public:
, m_currentArg(-1)
{}
void reset() QTC_OVERRIDE {}
int size() const QTC_OVERRIDE { return m_items.size(); }
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 m_items.size(); }
QString text(int index) const Q_DECL_OVERRIDE;
int activeArgument(const QString &prefix) const Q_DECL_OVERRIDE;
private:
QVector<GLSL::Function *> m_items;