diff options
Diffstat (limited to 'src/plugins/ios/iosdevice.h')
-rw-r--r-- | src/plugins/ios/iosdevice.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h index 10ff7cc97f..00933ed0ec 100644 --- a/src/plugins/ios/iosdevice.h +++ b/src/plugins/ios/iosdevice.h @@ -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::Ptr clone() const QTC_OVERRIDE; - void fromMap(const QVariantMap &map) QTC_OVERRIDE; - QVariantMap toMap() 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 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(); |