diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h index fd39525601c..1d85c24c0d1 100644 --- a/src/plugins/ios/iosbuildstep.h +++ b/src/plugins/ios/iosbuildstep.h @@ -52,7 +52,7 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep public: IosBuildStep(ProjectExplorer::BuildStepList *parent); - ~IosBuildStep(); + ~IosBuildStep() QTC_OVERRIDE; bool init() QTC_OVERRIDE; void run(QFutureInterface &fi) QTC_OVERRIDE; @@ -92,9 +92,9 @@ class IosBuildStepConfigWidget : public ProjectExplorer::BuildStepConfigWidget public: IosBuildStepConfigWidget(IosBuildStep *buildStep); - ~IosBuildStepConfigWidget(); - QString displayName() const; - QString summaryText() const; + ~IosBuildStepConfigWidget() QTC_OVERRIDE; + QString displayName() const QTC_OVERRIDE; + QString summaryText() const QTC_OVERRIDE; private slots: void buildArgumentsChanged(); diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h index 86a7c7c1996..a5f7c5249b8 100644 --- a/src/plugins/ios/iosdeploystep.h +++ b/src/plugins/ios/iosdeploystep.h @@ -36,6 +36,7 @@ #include #include #include +#include #include #include @@ -65,12 +66,12 @@ public: friend class IosDeployStepFactory; IosDeployStep(ProjectExplorer::BuildStepList *bc); - virtual ~IosDeployStep(); + ~IosDeployStep() QTC_OVERRIDE; - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) QTC_OVERRIDE; + QVariantMap toMap() const QTC_OVERRIDE; - virtual void run(QFutureInterface &fi); + void run(QFutureInterface &fi) QTC_OVERRIDE; void cleanup(); ProjectExplorer::IDevice::ConstPtr device() const; IosDevice::ConstPtr iosdevice() const; @@ -92,10 +93,10 @@ private slots: private: IosDeployStep(ProjectExplorer::BuildStepList *bc, IosDeployStep *other); - bool init(); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool immutable() const { return true; } - bool runInGuiThread() const { return true; } + bool init() QTC_OVERRIDE; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() QTC_OVERRIDE; + bool immutable() const QTC_OVERRIDE { return true; } + bool runInGuiThread() const QTC_OVERRIDE { return true; } void ctor(); QString deviceId() const; diff --git a/src/plugins/ios/iosdeploystepwidget.h b/src/plugins/ios/iosdeploystepwidget.h index b5e625b4f61..42eb3072f2c 100644 --- a/src/plugins/ios/iosdeploystepwidget.h +++ b/src/plugins/ios/iosdeploystepwidget.h @@ -30,6 +30,7 @@ #define IOSDEPLOYSTEPWIDGET_H #include +#include QT_BEGIN_NAMESPACE namespace Ui { class IosDeployStepWidget; } @@ -45,11 +46,11 @@ class IosDeployStepWidget : public ProjectExplorer::BuildStepConfigWidget public: IosDeployStepWidget(IosDeployStep *step); - ~IosDeployStepWidget(); + ~IosDeployStepWidget() QTC_OVERRIDE; private: - virtual QString summaryText() const; - virtual QString displayName() const; + QString summaryText() const QTC_OVERRIDE; + QString displayName() const QTC_OVERRIDE; Ui::IosDeployStepWidget *ui; IosDeployStep *m_step; diff --git a/src/plugins/ios/iosdevice.h b/src/plugins/ios/iosdevice.h index a0f9456ec7e..aa572ef7000 100644 --- a/src/plugins/ios/iosdevice.h +++ b/src/plugins/ios/iosdevice.h @@ -29,11 +29,14 @@ #ifndef IOSDEVICE_H #define IOSDEVICE_H +#include "iostoolhandler.h" + #include +#include + #include #include #include -#include "iostoolhandler.h" #include namespace ProjectExplorer{ @@ -52,17 +55,17 @@ public: typedef QSharedPointer ConstPtr; typedef QSharedPointer Ptr; - ProjectExplorer::IDevice::DeviceInfo deviceInformation() const; - ProjectExplorer::IDeviceWidget *createWidget(); - QList actionIds() const; - QString displayNameForActionId(Core::Id actionId) const; - void executeAction(Core::Id actionId, QWidget *parent = 0); - ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const; - QString displayType() const; + ProjectExplorer::IDevice::DeviceInfo deviceInformation() const QTC_OVERRIDE; + ProjectExplorer::IDeviceWidget *createWidget() QTC_OVERRIDE; + QList 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; - void fromMap(const QVariantMap &map); - QVariantMap toMap() const; + ProjectExplorer::IDevice::Ptr clone() const QTC_OVERRIDE; + void fromMap(const QVariantMap &map) QTC_OVERRIDE; + QVariantMap toMap() const QTC_OVERRIDE; QString uniqueDeviceID() const; IosDevice(const QString &uid); QString osVersion() const; diff --git a/src/plugins/ios/iosdevicefactory.h b/src/plugins/ios/iosdevicefactory.h index 582f725f4a6..2575897ed09 100644 --- a/src/plugins/ios/iosdevicefactory.h +++ b/src/plugins/ios/iosdevicefactory.h @@ -30,10 +30,11 @@ #define IOSDEVICEFACTORY_H #include +#include + #include #include #include -#include namespace Ios { namespace Internal { diff --git a/src/plugins/ios/iosplugin.h b/src/plugins/ios/iosplugin.h index f374fca76e4..91bf6cf04c0 100644 --- a/src/plugins/ios/iosplugin.h +++ b/src/plugins/ios/iosplugin.h @@ -30,6 +30,7 @@ #define IOSPLUGIN_H #include +#include namespace Ios { @@ -41,8 +42,8 @@ class IosPlugin : public ExtensionSystem::IPlugin public: IosPlugin(); - bool initialize(const QStringList &arguments, QString *errorMessage); - void extensionsInitialized(); + bool initialize(const QStringList &arguments, QString *errorMessage) QTC_OVERRIDE; + void extensionsInitialized() QTC_OVERRIDE; private slots: void kitsRestored(); }; diff --git a/src/plugins/ios/iosqtversion.h b/src/plugins/ios/iosqtversion.h index d7f3f85b249..e95dfdccd0c 100644 --- a/src/plugins/ios/iosqtversion.h +++ b/src/plugins/ios/iosqtversion.h @@ -30,6 +30,7 @@ #define IOSQTVERSION_H #include +#include #include @@ -45,20 +46,20 @@ public: IosQtVersion(const Utils::FileName &path, bool isAutodetected = false, const QString &autodetectionSource = QString()); - IosQtVersion *clone() const; - QString type() const; - bool isValid() const; - QString invalidReason() const; + IosQtVersion *clone() const QTC_OVERRIDE; + QString type() const QTC_OVERRIDE; + bool isValid() const QTC_OVERRIDE; + QString invalidReason() const QTC_OVERRIDE; - QList detectQtAbis() const; + QList detectQtAbis() const QTC_OVERRIDE; - void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const; + void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const QTC_OVERRIDE; - Core::FeatureSet availableFeatures() const; - QString platformName() const; - QString platformDisplayName() const; + Core::FeatureSet availableFeatures() const QTC_OVERRIDE; + QString platformName() const QTC_OVERRIDE; + QString platformDisplayName() const QTC_OVERRIDE; - QString description() const; + QString description() const QTC_OVERRIDE; }; } // namespace Internal diff --git a/src/plugins/ios/iosrunconfiguration.h b/src/plugins/ios/iosrunconfiguration.h index 6ae4dbb2895..0acf6f8ec1f 100644 --- a/src/plugins/ios/iosrunconfiguration.h +++ b/src/plugins/ios/iosrunconfiguration.h @@ -34,6 +34,7 @@ #include #include +#include namespace Ios { namespace Internal { @@ -50,8 +51,8 @@ class IosRunConfiguration : public ProjectExplorer::RunConfiguration public: IosRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &path); - QWidget *createConfigurationWidget(); - Utils::OutputFormatter *createOutputFormatter() const; + QWidget *createConfigurationWidget() QTC_OVERRIDE; + Utils::OutputFormatter *createOutputFormatter() const QTC_OVERRIDE; IosDeployStep *deployStep() const; QStringList commandLineArguments(); diff --git a/src/plugins/ios/iosruncontrol.h b/src/plugins/ios/iosruncontrol.h index f216c450bf2..b03953c9e31 100644 --- a/src/plugins/ios/iosruncontrol.h +++ b/src/plugins/ios/iosruncontrol.h @@ -30,6 +30,7 @@ #define IOSRUNCONTROL_H #include +#include namespace Ios { namespace Internal { @@ -43,14 +44,14 @@ class IosRunControl : public ProjectExplorer::RunControl public: explicit IosRunControl(IosRunConfiguration *runConfig); - ~IosRunControl(); + ~IosRunControl() QTC_OVERRIDE; - void start(); - StopResult stop(); - bool isRunning() const; - QString displayName() const; - QIcon icon() const; + void start() QTC_OVERRIDE; + StopResult stop() QTC_OVERRIDE; + bool isRunning() const QTC_OVERRIDE; + QString displayName() const QTC_OVERRIDE; + QIcon icon() const QTC_OVERRIDE; private slots: void handleRemoteProcessFinished(bool cleanEnd); diff --git a/src/plugins/ios/iosrunfactories.h b/src/plugins/ios/iosrunfactories.h index abecfc25241..6f86be5f0a8 100644 --- a/src/plugins/ios/iosrunfactories.h +++ b/src/plugins/ios/iosrunfactories.h @@ -64,11 +64,13 @@ public: bool canHandle(ProjectExplorer::Target *t) const QTC_OVERRIDE; QList runConfigurationsForNode(ProjectExplorer::Target *t, - ProjectExplorer::Node *n) QTC_OVERRIDE; + ProjectExplorer::Node *n + ) QTC_OVERRIDE; private: - ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, const Core::Id id); + ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, + const Core::Id id) QTC_OVERRIDE; ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent, - const QVariantMap &map); + const QVariantMap &map) QTC_OVERRIDE; }; class IosRunControlFactory : public ProjectExplorer::IRunControlFactory diff --git a/src/plugins/ios/iossettingspage.h b/src/plugins/ios/iossettingspage.h index f9a26cb12eb..edad802bc16 100644 --- a/src/plugins/ios/iossettingspage.h +++ b/src/plugins/ios/iossettingspage.h @@ -30,6 +30,7 @@ #define IOSSETTINGSPAGE_H #include +#include #include @@ -45,9 +46,9 @@ class IosSettingsPage : public Core::IOptionsPage public: explicit IosSettingsPage(QObject *parent = 0); - QWidget *widget(); - void apply(); - void finish(); + QWidget *widget() QTC_OVERRIDE; + void apply() QTC_OVERRIDE; + void finish() QTC_OVERRIDE; private: QPointer m_widget; diff --git a/src/plugins/ios/iossimulator.h b/src/plugins/ios/iossimulator.h index 6349562cb20..fbd464fb8ff 100644 --- a/src/plugins/ios/iossimulator.h +++ b/src/plugins/ios/iossimulator.h @@ -31,6 +31,7 @@ #include #include +#include #include @@ -47,19 +48,19 @@ class IosSimulator : public ProjectExplorer::IDevice public: typedef QSharedPointer ConstPtr; typedef QSharedPointer Ptr; - ProjectExplorer::IDevice::DeviceInfo deviceInformation() const; + ProjectExplorer::IDevice::DeviceInfo deviceInformation() const QTC_OVERRIDE; - QString displayType() const; - ProjectExplorer::IDeviceWidget *createWidget(); - QList actionIds() const; - QString displayNameForActionId(Core::Id actionId) const; - void executeAction(Core::Id actionId, QWidget *parent = 0); - ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const; + QString displayType() const QTC_OVERRIDE; + ProjectExplorer::IDeviceWidget *createWidget() QTC_OVERRIDE; + QList 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; Utils::FileName simulatorPath() const; - void fromMap(const QVariantMap &map); - QVariantMap toMap() const; + void fromMap(const QVariantMap &map) QTC_OVERRIDE; + QVariantMap toMap() const QTC_OVERRIDE; - ProjectExplorer::IDevice::Ptr clone() const; + ProjectExplorer::IDevice::Ptr clone() const QTC_OVERRIDE; protected: friend class IosSimulatorFactory;