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

13
src/plugins/ios/iosdevicefactory.h
View File

@@ -30,7 +30,6 @@
#define IOSDEVICEFACTORY_H
#include <projectexplorer/devicesupport/idevicefactory.h>
#include <utils/qtcoverride.h>
#include <QTimer>
#include <QMap>
@@ -45,13 +44,13 @@ class IosDeviceFactory : public ProjectExplorer::IDeviceFactory
public:
IosDeviceFactory();
QString displayNameForId(Core::Id type) const QTC_OVERRIDE;
QList<Core::Id> availableCreationIds() const QTC_OVERRIDE;
QString displayNameForId(Core::Id type) const Q_DECL_OVERRIDE;
QList<Core::Id> availableCreationIds() const Q_DECL_OVERRIDE;
bool canCreate() const QTC_OVERRIDE;
ProjectExplorer::IDevice::Ptr create(Core::Id id) const QTC_OVERRIDE;
bool canRestore(const QVariantMap &map) const QTC_OVERRIDE;
ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const QTC_OVERRIDE;
bool canCreate() const Q_DECL_OVERRIDE;
ProjectExplorer::IDevice::Ptr create(Core::Id id) const Q_DECL_OVERRIDE;
bool canRestore(const QVariantMap &map) const Q_DECL_OVERRIDE;
ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const Q_DECL_OVERRIDE;
};
} // namespace Internal