ios: fixes for C++11 compilation

Change-Id: I1d333c623f204a41dc92ebd03cbd67958e4588a7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

9 files changed, 55 insertions, 82 deletions

diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h
index 43d99ce8a4..7834f3b789 100644
--- a/src/plugins/ios/iosbuildstep.h
+++ b/src/plugins/ios/iosbuildstep.h
@@ -30,6 +30,7 @@
 #define IOSBUILDSTEP_H
 
 #include <projectexplorer/abstractprocessstep.h>
+#include <utils/qtcoverride.h>
 
 QT_BEGIN_NAMESPACE
 class QListWidgetItem;
@@ -53,11 +54,11 @@ public:
     IosBuildStep(ProjectExplorer::BuildStepList *parent);
     ~IosBuildStep();
 
-    bool init();
-    void run(QFutureInterface<bool> &fi);
+    bool init() QTC_OVERRIDE;
+    void run(QFutureInterface<bool> &fi) QTC_OVERRIDE;
 
-    ProjectExplorer::BuildStepConfigWidget *createConfigWidget();
-    bool immutable() const;
+    ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE;
+    bool immutable() const QTC_OVERRIDE;
     void setBaseArguments(const QStringList &args);
     void setExtraArguments(const QStringList &extraArgs);
     QStringList baseArguments() const;
@@ -68,11 +69,11 @@ public:
     void setClean(bool clean);
     bool isClean() const;
 
-    QVariantMap toMap() const;
+    QVariantMap toMap() const QTC_OVERRIDE;
 protected:
     IosBuildStep(ProjectExplorer::BuildStepList *parent, IosBuildStep *bs);
     IosBuildStep(ProjectExplorer::BuildStepList *parent, const Core::Id id);
-    bool fromMap(const QVariantMap &map);
+    bool fromMap(const QVariantMap &map) QTC_OVERRIDE;
 
 private:
     void ctor();
@@ -114,18 +115,18 @@ class IosBuildStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     explicit IosBuildStepFactory(QObject *parent = 0);
 
-    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
+    bool canCreate(ProjectExplorer::BuildStepList *parent, const Core::Id id) const QTC_OVERRIDE;
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id) QTC_OVERRIDE;
     bool canClone(ProjectExplorer::BuildStepList *parent,
-                  ProjectExplorer::BuildStep *source) const;
+                  ProjectExplorer::BuildStep *source) const QTC_OVERRIDE;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
-                                      ProjectExplorer::BuildStep *source);
-    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
+                                      ProjectExplorer::BuildStep *source) QTC_OVERRIDE;
+    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
     ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent,
-                                        const QVariantMap &map);
+                                        const QVariantMap &map) QTC_OVERRIDE;
 
-    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const;
-    QString displayNameForId(const Core::Id id) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *bc) const QTC_OVERRIDE;
+    QString displayNameForId(const Core::Id id) const QTC_OVERRIDE;
 };
 
 } // namespace Internal
diff --git a/src/plugins/ios/iosdeployconfiguration.h b/src/plugins/ios/iosdeployconfiguration.h
index 632b2b5aa4..f92ac8cc3c 100644
--- a/src/plugins/ios/iosdeployconfiguration.h
+++ b/src/plugins/ios/iosdeployconfiguration.h
@@ -30,6 +30,7 @@
 #define IOSDEPLOYCONFIGURATION_H
 
 #include <projectexplorer/deployconfiguration.h>
+#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -58,22 +59,22 @@ class IosDeployConfigurationFactory : public ProjectExplorer::DeployConfiguratio
 public:
     explicit IosDeployConfigurationFactory(QObject *parent = 0);
 
-    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
-    ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id);
-    bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
+    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const QTC_OVERRIDE;
+    ProjectExplorer::DeployConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id) QTC_OVERRIDE;
+    bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const QTC_OVERRIDE;
     ProjectExplorer::DeployConfiguration *restore(ProjectExplorer::Target *parent,
-                                                  const QVariantMap &map);
+                                                  const QVariantMap &map) QTC_OVERRIDE;
     bool canClone(ProjectExplorer::Target *parent,
-                  ProjectExplorer::DeployConfiguration *source) const;
+                  ProjectExplorer::DeployConfiguration *source) const QTC_OVERRIDE;
     ProjectExplorer::DeployConfiguration *clone(ProjectExplorer::Target *parent,
-                                                ProjectExplorer::DeployConfiguration *source);
+                                                ProjectExplorer::DeployConfiguration *source) QTC_OVERRIDE;
 
-    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
     // used to translate the ids to names to display to the user
-    QString displayNameForId(const Core::Id id) const;
+    QString displayNameForId(const Core::Id id) const QTC_OVERRIDE;
 
 private:
-    bool canHandle(ProjectExplorer::Target *parent) const;
+    bool canHandle(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
 };
 
 } // namespace Internal
diff --git a/src/plugins/ios/iosdeploystepfactory.h b/src/plugins/ios/iosdeploystepfactory.h
index 9249488392..be9fc63bc7 100644
--- a/src/plugins/ios/iosdeploystepfactory.h
+++ b/src/plugins/ios/iosdeploystepfactory.h
@@ -30,6 +30,7 @@
 #define IOSDEPLOYSTEPFACTORY_H
 
 #include <projectexplorer/buildstep.h>
+#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -40,20 +41,20 @@ class IosDeployStepFactory : public ProjectExplorer::IBuildStepFactory
 public:
     explicit IosDeployStepFactory(QObject *parent = 0);
 
-    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const;
-    QString displayNameForId(const Core::Id id) const;
+    QList<Core::Id> availableCreationIds(ProjectExplorer::BuildStepList *parent) const QTC_OVERRIDE;
+    QString displayNameForId(const Core::Id id) const QTC_OVERRIDE;
 
     bool canCreate(ProjectExplorer::BuildStepList *parent,
-                   const Core::Id id) const;
-    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id);
+                   const Core::Id id) const QTC_OVERRIDE;
+    ProjectExplorer::BuildStep *create(ProjectExplorer::BuildStepList *parent, const Core::Id id) QTC_OVERRIDE;
 
-    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const;
-    ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map);
+    bool canRestore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) const QTC_OVERRIDE;
+    ProjectExplorer::BuildStep *restore(ProjectExplorer::BuildStepList *parent, const QVariantMap &map) QTC_OVERRIDE;
 
     bool canClone(ProjectExplorer::BuildStepList *parent,
-                  ProjectExplorer::BuildStep *product) const;
+                  ProjectExplorer::BuildStep *product) const QTC_OVERRIDE;
     ProjectExplorer::BuildStep *clone(ProjectExplorer::BuildStepList *parent,
-                                      ProjectExplorer::BuildStep *product);
+                                      ProjectExplorer::BuildStep *product) QTC_OVERRIDE;
 };
 
 } // namespace Internal
diff --git a/src/plugins/ios/iosdevicefactory.h b/src/plugins/ios/iosdevicefactory.h
index c77ecc7483..704e4f34f6 100644
--- a/src/plugins/ios/iosdevicefactory.h
+++ b/src/plugins/ios/iosdevicefactory.h
@@ -33,6 +33,7 @@
 #include <QTimer>
 #include <QMap>
 #include <QString>
+#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -43,13 +44,13 @@ class IosDeviceFactory : public ProjectExplorer::IDeviceFactory
 public:
     IosDeviceFactory();
 
-    QString displayNameForId(Core::Id type) const;
-    QList<Core::Id> availableCreationIds() const;
+    QString displayNameForId(Core::Id type) const QTC_OVERRIDE;
+    QList<Core::Id> availableCreationIds() const QTC_OVERRIDE;
 
-    bool canCreate() const;
-    ProjectExplorer::IDevice::Ptr create(Core::Id id) const;
-    bool canRestore(const QVariantMap &map) const;
-    ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const;
+    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;
 };
 
 } // namespace Internal
diff --git a/src/plugins/ios/iosmanager.cpp b/src/plugins/ios/iosmanager.cpp
index 4f25cba3b9..16fddc102b 100644
--- a/src/plugins/ios/iosmanager.cpp
+++ b/src/plugins/ios/iosmanager.cpp
@@ -47,7 +47,6 @@
 #include <QFileSystemWatcher>
 #include <QList>
 #include <QProcess>
-#include <QMessageBox>
 #include <QApplication>
 #include <QDomDocument>
 
diff --git a/src/plugins/ios/iosqtversionfactory.h b/src/plugins/ios/iosqtversionfactory.h
index d63b578086..2757576e0f 100644
--- a/src/plugins/ios/iosqtversionfactory.h
+++ b/src/plugins/ios/iosqtversionfactory.h
@@ -30,6 +30,7 @@
 #define IOSQTVERSIONFACTORY_H
 
 #include <qtsupport/qtversionfactory.h>
+#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -39,13 +40,13 @@ class IosQtVersionFactory : public QtSupport::QtVersionFactory
 public:
     explicit IosQtVersionFactory(QObject *parent = 0);
 
-    bool canRestore(const QString &type);
-    QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data);
+    bool canRestore(const QString &type) QTC_OVERRIDE;
+    QtSupport::BaseQtVersion *restore(const QString &type, const QVariantMap &data) QTC_OVERRIDE;
 
-    int priority() const;
+    int priority() const QTC_OVERRIDE;
     QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
                                      bool isAutoDetected = false,
-                                     const QString &autoDetectionSource = QString());
+                                     const QString &autoDetectionSource = QString()) QTC_OVERRIDE;
 };
 
 } // namespace Internal
diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp
index 2ddaf5e1b1..c5517270bd 100644
--- a/src/plugins/ios/iosrunfactories.cpp
+++ b/src/plugins/ios/iosrunfactories.cpp
@@ -110,27 +110,6 @@ QString IosRunConfigurationFactory::displayNameForId(const Core::Id id) const
     return QFileInfo(pathFromId(id)).completeBaseName();
 }
 
-RunConfiguration *IosRunConfigurationFactory::create(Target *parent, const Core::Id id)
-{
-    if (!canCreate(parent, id))
-        return 0;
-    return new IosRunConfiguration(parent, id, pathFromId(id));
-}
-
-RunConfiguration *IosRunConfigurationFactory::restore(Target *parent,
-    const QVariantMap &map)
-{
-    if (!canRestore(parent, map))
-        return 0;
-    Core::Id id = ProjectExplorer::idFromMap(map);
-    IosRunConfiguration *rc = new IosRunConfiguration(parent, id, pathFromId(id));
-    if (rc->fromMap(map))
-        return rc;
-
-    delete rc;
-    return 0;
-}
-
 RunConfiguration *IosRunConfigurationFactory::clone(Target *parent, RunConfiguration *source)
 {
     if (!canClone(parent, source))
@@ -193,10 +172,5 @@ RunControl *IosRunControlFactory::create(RunConfiguration *runConfig,
         return IosDebugSupport::createDebugRunControl(rc, errorMessage);
 }
 
-QString IosRunControlFactory::displayName() const
-{
-    return tr("Run on iOS device or simulator.");
-}
-
 } // namespace Internal
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/ios/iosrunfactories.h b/src/plugins/ios/iosrunfactories.h
index 5b63620e6b..c7de3148a7 100644
--- a/src/plugins/ios/iosrunfactories.h
+++ b/src/plugins/ios/iosrunfactories.h
@@ -54,12 +54,8 @@ public:
     QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const QTC_OVERRIDE;
 
     bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const QTC_OVERRIDE;
-    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Target *parent,
-                                                              const Core::Id id) QTC_OVERRIDE;
 
     bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const QTC_OVERRIDE;
-    ProjectExplorer::RunConfiguration *restore(ProjectExplorer::Target *parent,
-                                                               const QVariantMap &map) QTC_OVERRIDE;
 
     bool canClone(ProjectExplorer::Target *parent,
                                   ProjectExplorer::RunConfiguration *source) const QTC_OVERRIDE;
@@ -82,13 +78,11 @@ class IosRunControlFactory : public ProjectExplorer::IRunControlFactory
 public:
     explicit IosRunControlFactory(QObject *parent = 0);
 
-    QString displayName() const;
-
     bool canRun(ProjectExplorer::RunConfiguration *runConfiguration,
-                ProjectExplorer::RunMode mode) const;
+                ProjectExplorer::RunMode mode) const QTC_OVERRIDE;
     ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,
                        ProjectExplorer::RunMode mode,
-                       QString *errorMessage);
+                       QString *errorMessage) QTC_OVERRIDE;
 };
 
 } // namespace Internal
diff --git a/src/plugins/ios/iossimulatorfactory.h b/src/plugins/ios/iossimulatorfactory.h
index 763912ce8e..5055af6f07 100644
--- a/src/plugins/ios/iossimulatorfactory.h
+++ b/src/plugins/ios/iossimulatorfactory.h
@@ -30,6 +30,7 @@
 #define IOSSIMULATORFACTORY_H
 
 #include <projectexplorer/devicesupport/idevicefactory.h>
+#include <utils/qtcoverride.h>
 
 namespace Ios {
 namespace Internal {
@@ -40,13 +41,13 @@ class IosSimulatorFactory : public ProjectExplorer::IDeviceFactory
 public:
     IosSimulatorFactory();
 
-    QString displayNameForId(Core::Id type) const;
-    QList<Core::Id> availableCreationIds() const;
+    QString displayNameForId(Core::Id type) const QTC_OVERRIDE;
+    QList<Core::Id> availableCreationIds() const QTC_OVERRIDE;
 
-    bool canCreate() const;
-    ProjectExplorer::IDevice::Ptr create(Core::Id id) const;
-    bool canRestore(const QVariantMap &map) const;
-    ProjectExplorer::IDevice::Ptr restore(const QVariantMap &map) const;
+    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;
 };
 
 } // namespace Internal