aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Hunger <[email protected]>2015-06-03 15:32:21 +0200
committerTobias Hunger <[email protected]>2015-06-04 08:31:15 +0000
commit6d6bb7a43384062e26a583c738a13c774dfd1f5a (patch)
tree4f2a15f35612864f185406e3e2897bef389cac54
parent68970e9d9608afc505cfa321c1bcba0e735be415 (diff)
ios: s/Q_DECL_OVERRIDE/override/g
Change-Id: I34749159abb7c48172a093037a4de800fabcecd2 Reviewed-by: Eike Ziller <[email protected]>
-rw-r--r--src/plugins/ios/iosbuildstep.h32
-rw-r--r--src/plugins/ios/iosdeployconfiguration.h16
-rw-r--r--src/plugins/ios/iosdeploystep.h14
-rw-r--r--src/plugins/ios/iosdeploystepfactory.h16
-rw-r--r--src/plugins/ios/iosdeploystepwidget.h4
-rw-r--r--src/plugins/ios/iosdevice.h24
-rw-r--r--src/plugins/ios/iosdevicefactory.h12
-rw-r--r--src/plugins/ios/iosdsymbuildstep.h38
-rw-r--r--src/plugins/ios/iosplugin.h4
-rw-r--r--src/plugins/ios/iosqtversion.h20
-rw-r--r--src/plugins/ios/iosqtversionfactory.h8
-rw-r--r--src/plugins/ios/iosrunconfiguration.h8
-rw-r--r--src/plugins/ios/iosruncontrol.h8
-rw-r--r--src/plugins/ios/iosrunfactories.h24
-rw-r--r--src/plugins/ios/iossettingspage.h6
-rw-r--r--src/plugins/ios/iossimulator.h22
-rw-r--r--src/plugins/ios/iossimulatorfactory.h12
17 files changed, 134 insertions, 134 deletions
diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h
index 271e3e8597f..71b3a9e0a44 100644
--- a/src/plugins/ios/iosbuildstep.h
+++ b/src/plugins/ios/iosbuildstep.h
@@ -54,11 +54,11 @@ public:
IosBuildStep(ProjectExplorer::BuildStepList *parent);
~IosBuildStep();
- bool init() Q_DECL_OVERRIDE;
- void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
+ bool init() override;
+ void run(QFutureInterface<bool> &fi) override;
- ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
- bool immutable() const Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+ bool immutable() const override;
void setBaseArguments(const QStringList &args);
void setExtraArguments(const QStringList &extraArgs);
QStringList baseArguments() const;
@@ -69,11 +69,11 @@ public:
void setClean(bool clean);
bool isClean() const;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
IosBuildStep(ProjectExplorer::BuildStepList *parent, IosBuildStep *bs);
IosBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
- bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
+ bool fromMap(const QVariantMap &map) override;
private:
void ctor();
@@ -92,8 +92,8 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget
public:
IosBuildStepConfigWidget(IosBuildStep *buildStep);
~IosBuildStepConfigWidget();
- QString displayName() const Q_DECL_OVERRIDE;
- QString summaryText() const Q_DECL_OVERRIDE;
+ QString displayName() const override;
+ QString summaryText() const override;
private slots:
void buildArgumentsChanged();
@@ -114,18 +114,18 @@ class IosBuildStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosBuildStepFactory(QObject *parent = 0);
- bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const Q_DECL_OVERRIDE;
- ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
+ bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override;
+ ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override;
bool canClone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *source) const Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStep *source) const override;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *source) Q_DECL_OVERRIDE;
- bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStep *source) override;
+ bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
- const QVariantMap &map) Q_DECL_OVERRIDE;
+ const QVariantMap &map) override;
- QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const Q_DECL_OVERRIDE;
- QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
+ QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const override;
+ QString displayNameForId(Core::Id id) const override;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosdeployconfiguration.h b/src/plugins/ios/iosdeployconfiguration.h
index 48baad751bc..1a0df803514 100644
--- a/src/plugins/ios/iosdeployconfiguration.h
+++ b/src/plugins/ios/iosdeployconfiguration.h
@@ -59,19 +59,19 @@ class IosDeployConfigurationFactory : public ProjectExplorer::DeployConfiguratio
public:
explicit IosDeployConfigurationFactory(QObject *parent = 0);
- bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const Q_DECL_OVERRIDE;
- ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) Q_DECL_OVERRIDE;
- bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
+ bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override;
+ ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, Core::Id id) override;
+ bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override;
ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent,
- const QVariantMap &map) Q_DECL_OVERRIDE;
+ const QVariantMap &map) override;
bool canClone(ProjectExplorer::Target *parent,
- ProjectExplorer::DeployConfiguration *source) const Q_DECL_OVERRIDE;
+ ProjectExplorer::DeployConfiguration *source) const override;
ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent,
- ProjectExplorer::DeployConfiguration *source) Q_DECL_OVERRIDE;
+ ProjectExplorer::DeployConfiguration *source) override;
- QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const Q_DECL_OVERRIDE;
+ QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const override;
// used to translate the ids to names to display to the user
- QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
+ QString displayNameForId(Core::Id id) const override;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h
index 747f8661cb4..6cc2b23ae1b 100644
--- a/src/plugins/ios/iosdeploystep.h
+++ b/src/plugins/ios/iosdeploystep.h
@@ -68,10 +68,10 @@ public:
~IosDeployStep();
- bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ bool fromMap(const QVariantMap &map) override;
+ QVariantMap toMap() const override;
- void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
+ void run(QFutureInterface<bool> &fi) override;
void cleanup();
void cancel();
signals:
@@ -90,10 +90,10 @@ private slots:
private:
IosDeployStep(ProjectExplorer::BuildStepList *bc,
IosDeployStep *other);
- bool init() Q_DECL_OVERRIDE;
- ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
- bool immutable() const Q_DECL_OVERRIDE { return true; }
- bool runInGuiThread() const Q_DECL_OVERRIDE { return true; }
+ bool init() override;
+ ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+ bool immutable() const override { return true; }
+ bool runInGuiThread() const override { return true; }
ProjectExplorer::IDevice::ConstPtr device() const;
IosDevice::ConstPtr iosdevice() const;
IosSimulator::ConstPtr iossimulator() const;
diff --git a/src/plugins/ios/iosdeploystepfactory.h b/src/plugins/ios/iosdeploystepfactory.h
index 07107266cce..6bd9e2d8a49 100644
--- a/src/plugins/ios/iosdeploystepfactory.h
+++ b/src/plugins/ios/iosdeploystepfactory.h
@@ -41,20 +41,20 @@ class IosDeployStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosDeployStepFactory(QObject *parent = 0);
- QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const Q_DECL_OVERRIDE;
- QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
+ QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const override;
+ QString displayNameForId(Core::Id id) const override;
bool canCreate(ProjectExplorer::BuildStepList *parent,
- Core::Id id) const Q_DECL_OVERRIDE;
- ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
+ Core::Id id) const override;
+ ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override;
- bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
- ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) Q_DECL_OVERRIDE;
+ bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override;
+ ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) override;
bool canClone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *product) const Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStep *product) const override;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *product) Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStep *product) override;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosdeploystepwidget.h b/src/plugins/ios/iosdeploystepwidget.h
index d64b3e65af6..b1f7329d31c 100644
--- a/src/plugins/ios/iosdeploystepwidget.h
+++ b/src/plugins/ios/iosdeploystepwidget.h
@@ -49,8 +49,8 @@ public:
~IosDeployStepWidget();
private:
- QString summaryText() const Q_DECL_OVERRIDE;
- QString displayName() const Q_DECL_OVERRIDE;
+ QString summaryText() const override;
+ QString displayName() const override;
Ui::IosDeployStepWidget *ui;
IosDeployStep *m_step;
diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h
index 863b4900698..25c09be589a 100644
--- a/src/plugins/ios/iosdevice.h
+++ b/src/plugins/ios/iosdevice.h
@@ -57,22 +57,22 @@ public:
typedef QSharedPointer<const IosDevice> ConstPtr;
typedef QSharedPointer<IosDevice> Ptr;
- 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;
+ ProjectExplorer::IDevice::DeviceInfo deviceInformation() const override;
+ ProjectExplorer::IDeviceWidget *createWidget() override;
+ QList<Core::Id> actionIds() const override;
+ QString displayNameForActionId(Core::Id actionId) const override;
+ void executeAction(Core::Id actionId, QWidget *parent = 0) override;
+ ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
+ QString displayType() const override;
+
+ ProjectExplorer::IDevice::Ptr clone() const override;
+ void fromMap(const QVariantMap &map) override;
+ QVariantMap toMap() const override;
QString uniqueDeviceID() const;
IosDevice(const QString &uid);
QString osVersion() const;
quint16 nextPort() const;
- bool canAutoDetectPorts() const Q_DECL_OVERRIDE;
+ bool canAutoDetectPorts() const override;
static QString name();
diff --git a/src/plugins/ios/iosdevicefactory.h b/src/plugins/ios/iosdevicefactory.h
index e9a105469ce..6a84916bbb3 100644
--- a/src/plugins/ios/iosdevicefactory.h
+++ b/src/plugins/ios/iosdevicefactory.h
@@ -45,13 +45,13 @@ class IosDeviceFactory : public ProjectExplorer::IDeviceFactory
public:
IosDeviceFactory();
- QString displayNameForId(Core::Id type) const Q_DECL_OVERRIDE;
- QList<Core::Id> availableCreationIds() const Q_DECL_OVERRIDE;
+ QString displayNameForId(Core::Id type) const override;
+ QList<Core::Id> availableCreationIds() const 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;
+ bool canCreate() const override;
+ ProjectExplorer::IDevice::Ptr create(Core::Id id) const override;
+ bool canRestore(const QVariantMap &map) const override;
+ ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const override;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h
index 7ed02cc9e6d..c3045404c9d 100644
--- a/src/plugins/ios/iosdsymbuildstep.h
+++ b/src/plugins/ios/iosdsymbuildstep.h
@@ -49,11 +49,11 @@ class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep
public:
~IosPresetBuildStep();
- bool init() Q_DECL_OVERRIDE;
- void run(QFutureInterface<bool> &fi) Q_DECL_OVERRIDE;
+ bool init() override;
+ void run(QFutureInterface<bool> &fi) override;
- ProjectExplorer::BuildStepConfigWidget *createConfigWidget() Q_DECL_OVERRIDE;
- bool immutable() const Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
+ bool immutable() const override;
void setArguments(const QStringList &args);
QStringList arguments() const;
QStringList defaultArguments() const;
@@ -64,12 +64,12 @@ public:
void setClean(bool clean);
bool isDefault() const;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QVariantMap toMap() const override;
protected:
IosPresetBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
virtual bool completeSetup();
virtual bool completeSetupWithStep(ProjectExplorer::BuildStep *bs);
- bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
+ bool fromMap(const QVariantMap &map) override;
virtual QStringList defaultCleanCmdList() const = 0;
virtual QStringList defaultCmdList() const = 0;
private:
@@ -85,8 +85,8 @@ class IosPresetBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWi
public:
IosPresetBuildStepConfigWidget(IosPresetBuildStep *buildStep);
~IosPresetBuildStepConfigWidget();
- QString displayName() const Q_DECL_OVERRIDE;
- QString summaryText() const Q_DECL_OVERRIDE;
+ QString displayName() const override;
+ QString summaryText() const override;
private slots:
void commandChanged();
@@ -107,14 +107,14 @@ class IosPresetBuildStepFactory : public ProjectExplorer::IBuildStepFactory
public:
explicit IosPresetBuildStepFactory(QObject *parent = 0);
- ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, Core::Id id) override;
bool canClone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *source) const Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStep *source) const override;
ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
- ProjectExplorer::BuildStep *source) Q_DECL_OVERRIDE;
- bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
+ ProjectExplorer::BuildStep *source) override;
+ bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const override;
ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
- const QVariantMap &map) Q_DECL_OVERRIDE;
+ const QVariantMap &map) override;
protected:
virtual IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
@@ -126,8 +126,8 @@ class IosDsymBuildStep : public IosPresetBuildStep
Q_OBJECT
friend class IosDsymBuildStepFactory;
protected:
- QStringList defaultCleanCmdList() const Q_DECL_OVERRIDE;
- QStringList defaultCmdList() const Q_DECL_OVERRIDE;
+ QStringList defaultCleanCmdList() const override;
+ QStringList defaultCmdList() const override;
IosDsymBuildStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
};
@@ -135,11 +135,11 @@ class IosDsymBuildStepFactory : public IosPresetBuildStepFactory
{
Q_OBJECT
public:
- bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const Q_DECL_OVERRIDE;
- QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const Q_DECL_OVERRIDE;
- QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
+ bool canCreate(ProjectExplorer::BuildStepList *parent, Core::Id id) const override;
+ QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const override;
+ QString displayNameForId(Core::Id id) const override;
IosPresetBuildStep *createPresetStep(ProjectExplorer::BuildStepList *parent,
- const Core::Id id) const Q_DECL_OVERRIDE;
+ const Core::Id id) const override;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosplugin.h b/src/plugins/ios/iosplugin.h
index 254df903b98..bd00005dcfa 100644
--- a/src/plugins/ios/iosplugin.h
+++ b/src/plugins/ios/iosplugin.h
@@ -42,8 +42,8 @@ class IosPlugin : public ExtensionSystem::IPlugin
public:
IosPlugin();
- bool initialize(const QStringList &arguments, QString *errorMessage) Q_DECL_OVERRIDE;
- void extensionsInitialized() Q_DECL_OVERRIDE;
+ bool initialize(const QStringList &arguments, QString *errorMessage) override;
+ void extensionsInitialized() override;
private slots:
void kitsRestored();
};
diff --git a/src/plugins/ios/iosqtversion.h b/src/plugins/ios/iosqtversion.h
index d80d9bb54da..e6a25d8d4a1 100644
--- a/src/plugins/ios/iosqtversion.h
+++ b/src/plugins/ios/iosqtversion.h
@@ -46,20 +46,20 @@ public:
IosQtVersion(const Utils::FileName &path, bool isAutodetected = false,
const QString &autodetectionSource = QString());
- IosQtVersion *clone() const Q_DECL_OVERRIDE;
- QString type() const Q_DECL_OVERRIDE;
- bool isValid() const Q_DECL_OVERRIDE;
- QString invalidReason() const Q_DECL_OVERRIDE;
+ IosQtVersion *clone() const override;
+ QString type() const override;
+ bool isValid() const override;
+ QString invalidReason() const override;
- QList<ProjectExplorer::Abi> detectQtAbis() const Q_DECL_OVERRIDE;
+ QList<ProjectExplorer::Abi> detectQtAbis() const override;
- void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const Q_DECL_OVERRIDE;
+ void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const override;
- Core::FeatureSet availableFeatures() const Q_DECL_OVERRIDE;
- QString platformName() const Q_DECL_OVERRIDE;
- QString platformDisplayName() const Q_DECL_OVERRIDE;
+ Core::FeatureSet availableFeatures() const override;
+ QString platformName() const override;
+ QString platformDisplayName() const override;
- QString description() const Q_DECL_OVERRIDE;
+ QString description() const override;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosqtversionfactory.h b/src/plugins/ios/iosqtversionfactory.h
index 68a5cd92698..8905753a52f 100644
--- a/src/plugins/ios/iosqtversionfactory.h
+++ b/src/plugins/ios/iosqtversionfactory.h
@@ -40,13 +40,13 @@ class IosQtVersionFactory : public QtSupport::QtVersionFactory
public:
explicit IosQtVersionFactory(QObject *parent = 0);
- bool canRestore(const QString &type) Q_DECL_OVERRIDE;
- QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) Q_DECL_OVERRIDE;
+ bool canRestore(const QString &type) override;
+ QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) override;
- int priority() const Q_DECL_OVERRIDE;
+ int priority() const override;
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false,
- const QString &autoDetectionSource = QString()) Q_DECL_OVERRIDE;
+ const QString &autoDetectionSource = QString()) override;
};
} // namespace Internal
diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h
index a5b24f387de..892c7c588dc 100644
--- a/src/plugins/ios/iosrunconfiguration.h
+++ b/src/plugins/ios/iosrunconfiguration.h
@@ -56,8 +56,8 @@ class IosRunConfiguration : public ProjectExplorer::RunConfiguration
public:
IosRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const Utils::FileName &path);
- QWidget *createConfigurationWidget() Q_DECL_OVERRIDE;
- Utils::OutputFormatter *createOutputFormatter() const Q_DECL_OVERRIDE;
+ QWidget *createConfigurationWidget() override;
+ Utils::OutputFormatter *createOutputFormatter() const override;
IosDeployStep *deployStep() const;
QStringList commandLineArguments();
@@ -70,8 +70,8 @@ public:
IosDeviceType deviceType() const;
void setDeviceType(const IosDeviceType &deviceType);
- bool fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ bool fromMap(const QVariantMap &map) override;
+ QVariantMap toMap() const override;
protected:
IosRunConfiguration(ProjectExplorer::Target *parent, IosRunConfiguration *source);
diff --git a/src/plugins/ios/iosruncontrol.h b/src/plugins/ios/iosruncontrol.h
index 9423c087079..c3ce9b48015 100644
--- a/src/plugins/ios/iosruncontrol.h
+++ b/src/plugins/ios/iosruncontrol.h
@@ -47,10 +47,10 @@ public:
~IosRunControl();
- void start() Q_DECL_OVERRIDE;
- StopResult stop() Q_DECL_OVERRIDE;
- bool isRunning() const Q_DECL_OVERRIDE;
- QString displayName() const Q_DECL_OVERRIDE;
+ void start() override;
+ StopResult stop() override;
+ bool isRunning() const override;
+ QString displayName() const override;
private slots:
void handleRemoteProcessFinished(bool cleanEnd);
diff --git a/src/plugins/ios/iosrunfactories.h b/src/plugins/ios/iosrunfactories.h
index 79faf58b2f5..51b566c294d 100644
--- a/src/plugins/ios/iosrunfactories.h
+++ b/src/plugins/ios/iosrunfactories.h
@@ -50,27 +50,27 @@ class IosRunConfigurationFactory : public QmakeProjectManager::QmakeRunConfigura
public:
explicit IosRunConfigurationFactory(QObject *parent = 0);
- QString displayNameForId(Core::Id id) const Q_DECL_OVERRIDE;
- QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const Q_DECL_OVERRIDE;
+ QString displayNameForId(Core::Id id) const override;
+ QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent, CreationMode mode = UserCreate) const override;
- bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const Q_DECL_OVERRIDE;
+ bool canCreate(ProjectExplorer::Target *parent, Core::Id id) const override;
- bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const Q_DECL_OVERRIDE;
+ bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const override;
bool canClone(ProjectExplorer::Target *parent,
- ProjectExplorer::RunConfiguration *source) const Q_DECL_OVERRIDE;
+ ProjectExplorer::RunConfiguration *source) const override;
ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent,
- ProjectExplorer::RunConfiguration *source) Q_DECL_OVERRIDE;
+ ProjectExplorer::RunConfiguration *source) override;
- bool canHandle(ProjectExplorer::Target *t) const Q_DECL_OVERRIDE;
+ bool canHandle(ProjectExplorer::Target *t) const override;
QList<ProjectExplorer::RunConfiguration *> runConfigurationsForNode(ProjectExplorer::Target *t,
const ProjectExplorer::Node *n
- ) Q_DECL_OVERRIDE;
+ ) override;
private:
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent,
- Core::Id id) Q_DECL_OVERRIDE;
+ Core::Id id) override;
ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
- const QVariantMap &map) Q_DECL_OVERRIDE;
+ const QVariantMap &map) override;
};
class IosRunControlFactory : public ProjectExplorer::IRunControlFactory
@@ -81,10 +81,10 @@ public:
explicit IosRunControlFactory(QObject *parent = 0);
bool canRun(ProjectExplorer::RunConfiguration *runConfiguration,
- ProjectExplorer::RunMode mode) const Q_DECL_OVERRIDE;
+ ProjectExplorer::RunMode mode) const override;
ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,
ProjectExplorer::RunMode mode,
- QString *errorMessage) Q_DECL_OVERRIDE;
+ QString *errorMessage) override;
private:
mutable QMap<Core::Id, QPointer<ProjectExplorer::RunControl> > m_activeRunControls;
};
diff --git a/src/plugins/ios/iossettingspage.h b/src/plugins/ios/iossettingspage.h
index 3354974eba3..06b0f1199b4 100644
--- a/src/plugins/ios/iossettingspage.h
+++ b/src/plugins/ios/iossettingspage.h
@@ -46,9 +46,9 @@ class IosSettingsPage : public Core::IOptionsPage
public:
explicit IosSettingsPage(QObject *parent = 0);
- QWidget *widget() Q_DECL_OVERRIDE;
- void apply() Q_DECL_OVERRIDE;
- void finish() Q_DECL_OVERRIDE;
+ QWidget *widget() override;
+ void apply() override;
+ void finish() override;
private:
QPointer<IosSettingsWidget> m_widget;
diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h
index 58eb9f16a67..370879fa307 100644
--- a/src/plugins/ios/iossimulator.h
+++ b/src/plugins/ios/iossimulator.h
@@ -70,24 +70,24 @@ class IosSimulator : public ProjectExplorer::IDevice
public:
typedef QSharedPointer<const IosSimulator> ConstPtr;
typedef QSharedPointer<IosSimulator> Ptr;
- ProjectExplorer::IDevice::DeviceInfo deviceInformation() const Q_DECL_OVERRIDE;
+ ProjectExplorer::IDevice::DeviceInfo deviceInformation() const override;
static QList<IosDeviceType> availableDevices();
static void setAvailableDevices(QList<IosDeviceType> value);
static void updateAvailableDevices();
- QString displayType() 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;
- void fromMap(const QVariantMap &map) Q_DECL_OVERRIDE;
- QVariantMap toMap() const Q_DECL_OVERRIDE;
+ QString displayType() const override;
+ ProjectExplorer::IDeviceWidget *createWidget() override;
+ QList<Core::Id> actionIds() const override;
+ QString displayNameForActionId(Core::Id actionId) const override;
+ void executeAction(Core::Id actionId, QWidget *parent = 0) override;
+ ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const override;
+ void fromMap(const QVariantMap &map) override;
+ QVariantMap toMap() const override;
quint16 nextPort() const;
- bool canAutoDetectPorts() const Q_DECL_OVERRIDE;
+ bool canAutoDetectPorts() const override;
- ProjectExplorer::IDevice::Ptr clone() const Q_DECL_OVERRIDE;
+ ProjectExplorer::IDevice::Ptr clone() const override;
protected:
friend class IosSimulatorFactory;
friend class IosConfigurations;
diff --git a/src/plugins/ios/iossimulatorfactory.h b/src/plugins/ios/iossimulatorfactory.h
index 69e8cf020de..251467255d0 100644
--- a/src/plugins/ios/iossimulatorfactory.h
+++ b/src/plugins/ios/iossimulatorfactory.h
@@ -41,13 +41,13 @@ class IosSimulatorFactory : public ProjectExplorer::IDeviceFactory
public:
IosSimulatorFactory();
- QString displayNameForId(Core::Id type) const Q_DECL_OVERRIDE;
- QList<Core::Id> availableCreationIds() const Q_DECL_OVERRIDE;
+ QString displayNameForId(Core::Id type) const override;
+ QList<Core::Id> availableCreationIds() const 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;
+ bool canCreate() const override;
+ ProjectExplorer::IDevice::Ptr create(Core::Id id) const override;
+ bool canRestore(const QVariantMap &map) const override;
+ ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const override;
};
} // namespace Internal