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/ios/iosdevice.h
View File

@@ -32,7 +32,6 @@
#include "iostoolhandler.h"
#include <projectexplorer/devicesupport/idevice.h>
#include <utils/qtcoverride.h>
#include <QVariantMap>
#include <QMap>
@@ -57,22 +56,22 @@ public:
typedef QSharedPointer<const IosDevice> ConstPtr;
typedef QSharedPointer<IosDevice> Ptr;
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const QTC_OVERRIDE;
ProjectExplorer::IDeviceWidget *createWidget() QTC_OVERRIDE;
QList<Core::Id> actionIds() const QTC_OVERRIDE;
QString displayNameForActionId(Core::Id actionId) const QTC_OVERRIDE;
void executeAction(Core::Id actionId, QWidget *parent = 0) QTC_OVERRIDE;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const QTC_OVERRIDE;
QString displayType() const QTC_OVERRIDE;
ProjectExplorer::IDevice::DeviceInfo deviceInformation() const Q_DECL_OVERRIDE;
ProjectExplorer::IDeviceWidget *createWidget() Q_DECL_OVERRIDE;
QList<Core::Id> actionIds() const Q_DECL_OVERRIDE;
QString displayNameForActionId(Core::Id actionId) const Q_DECL_OVERRIDE;
void executeAction(Core::Id actionId, QWidget *parent = 0) Q_DECL_OVERRIDE;
ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const Q_DECL_OVERRIDE;
QString displayType() const Q_DECL_OVERRIDE;
ProjectExplorer::IDevice::Ptr clone() const QTC_OVERRIDE;
void fromMap(const QVariantMap &map) QTC_OVERRIDE;
QVariantMap toMap() const QTC_OVERRIDE;
ProjectExplorer::IDevice::Ptr clone() const Q_DECL_OVERRIDE;
void fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
QVariantMap toMap() const Q_DECL_OVERRIDE;
QString uniqueDeviceID() const;
IosDevice(const QString &uid);
QString osVersion() const;
quint16 nextPort() const;
bool canAutoDetectPorts() const QTC_OVERRIDE;
bool canAutoDetectPorts() const Q_DECL_OVERRIDE;
static QString name();