diff options
author | Tobias Hunger <[email protected]> | 2015-11-13 11:06:27 +0100 |
---|---|---|
committer | Tobias Hunger <[email protected]> | 2015-11-16 10:14:32 +0000 |
commit | 0e278e9efeffef2de86decfc5e415a94d7234b4f (patch) | |
tree | ef4ca0117d5ab3dc65e7f707a9d626cc2dd48a0d /src | |
parent | ca29cbfc8a4cd2fad3556f0c98febc4692894265 (diff) |
ProjectConfiguration: Sprinkle override and explicit over the code
Change-Id: I2aa3a32a0d30f1d122977d94d4109227dea6bbd7
Reviewed-by: Niels Weber <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src')
52 files changed, 318 insertions, 320 deletions
diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h index a32d78a6e83..54fecedf8d0 100644 --- a/src/plugins/android/androidbuildapkstep.h +++ b/src/plugins/android/androidbuildapkstep.h @@ -54,8 +54,8 @@ public: BundleLibrariesDeployment }; - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; AndroidDeployAction deployAction() const; @@ -79,7 +79,7 @@ public: bool useGradle() const; void setUseGradle(bool b); - bool runInGuiThread() const; + bool runInGuiThread() const override; QString buildTargetSdk() const; void setBuildTargetSdk(const QString &sdk); @@ -97,10 +97,10 @@ protected: bool keystorePassword(); bool certificatePassword(); - bool init(); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool immutable() const { return true; } - void processFinished(int exitCode, QProcess::ExitStatus status); + bool init() override; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override { return true; } + void processFinished(int exitCode, QProcess::ExitStatus status) override; protected: AndroidDeployAction m_deployAction; diff --git a/src/plugins/android/androiddeployqtstep.h b/src/plugins/android/androiddeployqtstep.h index 1a2e7e02788..c09cf06f526 100644 --- a/src/plugins/android/androiddeployqtstep.h +++ b/src/plugins/android/androiddeployqtstep.h @@ -81,12 +81,12 @@ public: ForceUnintall }; public: - AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc); + explicit AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc); - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; - bool runInGuiThread() const; + bool runInGuiThread() const override; UninstallType uninstallPreviousPackage(); @@ -103,15 +103,15 @@ private: void ctor(); void runCommand(const QString &program, const QStringList &arguments); - bool init(); - void run(QFutureInterface<bool> &fi); + bool init() override; + void run(QFutureInterface<bool> &fi) override; enum DeployResult { Success, Failure, AskUinstall }; DeployResult runDeploy(QFutureInterface<bool> &fi); void slotAskForUninstall(); void slotSetSerialNumber(const QString &serialNumber); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool immutable() const { return true; } + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override { return true; } void processReadyReadStdOutput(); void stdOutput(const QString &line); diff --git a/src/plugins/android/androidrunconfiguration.h b/src/plugins/android/androidrunconfiguration.h index d62936e8cda..f64e2f52558 100644 --- a/src/plugins/android/androidrunconfiguration.h +++ b/src/plugins/android/androidrunconfiguration.h @@ -43,8 +43,8 @@ class ANDROID_EXPORT AndroidRunConfiguration : public ProjectExplorer::RunConfig public: AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); - QWidget *createConfigurationWidget(); - Utils::OutputFormatter *createOutputFormatter() const; + QWidget *createConfigurationWidget() override; + Utils::OutputFormatter *createOutputFormatter() const override; const QString remoteChannel() const; protected: diff --git a/src/plugins/autotoolsprojectmanager/autogenstep.h b/src/plugins/autotoolsprojectmanager/autogenstep.h index 347ffc9e2ac..2ac9ed39fe7 100644 --- a/src/plugins/autotoolsprojectmanager/autogenstep.h +++ b/src/plugins/autotoolsprojectmanager/autogenstep.h @@ -94,14 +94,14 @@ class AutogenStep : public ProjectExplorer::AbstractProcessStep friend class AutogenStepConfigWidget; public: - AutogenStep(ProjectExplorer::BuildStepList *bsl); + explicit AutogenStep(ProjectExplorer::BuildStepList *bsl); - bool init(); - void run(QFutureInterface<bool> &interface); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool immutable() const; + bool init() override; + void run(QFutureInterface<bool> &interface) override; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override; QString additionalArguments() const; - QVariantMap toMap() const; + QVariantMap toMap() const override; public slots: void setAdditionalArguments(const QString &list); @@ -113,7 +113,7 @@ protected: AutogenStep(ProjectExplorer::BuildStepList *bsl, AutogenStep *bs); AutogenStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; private: void ctor(); diff --git a/src/plugins/autotoolsprojectmanager/autoreconfstep.h b/src/plugins/autotoolsprojectmanager/autoreconfstep.h index 9ef25542940..425f55ff54c 100644 --- a/src/plugins/autotoolsprojectmanager/autoreconfstep.h +++ b/src/plugins/autotoolsprojectmanager/autoreconfstep.h @@ -94,14 +94,14 @@ class AutoreconfStep : public ProjectExplorer::AbstractProcessStep friend class AutoreconfStepConfigWidget; public: - AutoreconfStep(ProjectExplorer::BuildStepList *bsl); + explicit AutoreconfStep(ProjectExplorer::BuildStepList *bsl); - bool init(); - void run(QFutureInterface<bool> &interface); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool immutable() const; + bool init() override; + void run(QFutureInterface<bool> &interface) override; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override; QString additionalArguments() const; - QVariantMap toMap() const; + QVariantMap toMap() const override; public slots: void setAdditionalArguments(const QString &list); @@ -113,7 +113,7 @@ protected: AutoreconfStep(ProjectExplorer::BuildStepList *bsl, AutoreconfStep *bs); AutoreconfStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; private: void ctor(); diff --git a/src/plugins/autotoolsprojectmanager/configurestep.h b/src/plugins/autotoolsprojectmanager/configurestep.h index 28555237a76..ec3661899b5 100644 --- a/src/plugins/autotoolsprojectmanager/configurestep.h +++ b/src/plugins/autotoolsprojectmanager/configurestep.h @@ -93,14 +93,14 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep friend class ConfigureStepConfigWidget; public: - ConfigureStep(ProjectExplorer::BuildStepList *bsl); + explicit ConfigureStep(ProjectExplorer::BuildStepList *bsl); - bool init(); - void run(QFutureInterface<bool> &interface); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool immutable() const; + bool init() override; + void run(QFutureInterface<bool> &interface) override; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override; QString additionalArguments() const; - QVariantMap toMap() const; + QVariantMap toMap() const override; public slots: void setAdditionalArguments(const QString &list); @@ -114,7 +114,7 @@ protected: ConfigureStep(ProjectExplorer::BuildStepList *bsl, ConfigureStep *bs); ConfigureStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; private: void ctor(); diff --git a/src/plugins/autotoolsprojectmanager/makestep.h b/src/plugins/autotoolsprojectmanager/makestep.h index dd9bd2e5bb6..87af2e23a57 100644 --- a/src/plugins/autotoolsprojectmanager/makestep.h +++ b/src/plugins/autotoolsprojectmanager/makestep.h @@ -92,16 +92,16 @@ class MakeStep : public ProjectExplorer::AbstractProcessStep friend class MakeStepConfigWidget; public: - MakeStep(ProjectExplorer::BuildStepList *bsl); + explicit MakeStep(ProjectExplorer::BuildStepList *bsl); - bool init(); - void run(QFutureInterface<bool> &interface); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + bool init() override; + void run(QFutureInterface<bool> &interface) override; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; void setClean(bool clean); - bool immutable() const; + bool immutable() const override; void setBuildTarget(const QString &target, bool on); QString additionalArguments() const; - QVariantMap toMap() const; + QVariantMap toMap() const override; public slots: void setAdditionalArguments(const QString &list); @@ -113,7 +113,7 @@ protected: MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs); MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; private: void ctor(); diff --git a/src/plugins/baremetal/baremetalcustomrunconfiguration.h b/src/plugins/baremetal/baremetalcustomrunconfiguration.h index 94f0bc24a54..46392f57059 100644 --- a/src/plugins/baremetal/baremetalcustomrunconfiguration.h +++ b/src/plugins/baremetal/baremetalcustomrunconfiguration.h @@ -44,23 +44,23 @@ class BareMetalCustomRunConfiguration : public BareMetalRunConfiguration public: BareMetalCustomRunConfiguration(ProjectExplorer::Target *parent); BareMetalCustomRunConfiguration(ProjectExplorer::Target *parent, - BareMetalCustomRunConfiguration *source); + BareMetalCustomRunConfiguration *source); - bool isEnabled() const { return true; } - bool isConfigured() const; - ConfigurationState ensureConfigured(QString *errorMessage); - QWidget *createConfigurationWidget(); - Utils::OutputFormatter *createOutputFormatter() const; + bool isEnabled() const override { return true; } + bool isConfigured() const override; + ConfigurationState ensureConfigured(QString *errorMessage) override; + QWidget *createConfigurationWidget() override; + Utils::OutputFormatter *createOutputFormatter() const override; - virtual QString localExecutableFilePath() const { return m_localExecutable; } + virtual QString localExecutableFilePath() const override { return m_localExecutable; } void setLocalExecutableFilePath(const QString &executable) { m_localExecutable = executable; } static Core::Id runConfigId(); static QString runConfigDefaultDisplayName(); - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; private: QString m_localExecutable; diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h index c60b5c46774..dfbe47997b6 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h @@ -47,16 +47,16 @@ public: BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl, BareMetalGdbCommandsDeployStep *other); - ~BareMetalGdbCommandsDeployStep(); + ~BareMetalGdbCommandsDeployStep() override; - bool init(); - void run(QFutureInterface<bool> &fi); - bool runInGuiThread() const { return true;} + bool init() override; + void run(QFutureInterface<bool> &fi) override; + bool runInGuiThread() const override { return true;} - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; static Core::Id stepId(); static QString displayName(); diff --git a/src/plugins/baremetal/baremetalrunconfiguration.h b/src/plugins/baremetal/baremetalrunconfiguration.h index 1af747eed69..7aac3124082 100644 --- a/src/plugins/baremetal/baremetalrunconfiguration.h +++ b/src/plugins/baremetal/baremetalrunconfiguration.h @@ -50,10 +50,10 @@ public: explicit BareMetalRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &projectFilePath); - bool isEnabled() const; - QString disabledReason() const; - QWidget *createConfigurationWidget(); - Utils::OutputFormatter *createOutputFormatter() const; + bool isEnabled() const override; + QString disabledReason() const override; + QWidget *createConfigurationWidget() override; + Utils::OutputFormatter *createOutputFormatter() const override; virtual QString localExecutableFilePath() const; QString arguments() const; @@ -61,7 +61,7 @@ public: QString workingDirectory() const; void setWorkingDirectory(const QString &wd); - QVariantMap toMap() const; + QVariantMap toMap() const override; QString projectFilePath() const; @@ -73,7 +73,7 @@ signals: protected: BareMetalRunConfiguration(ProjectExplorer::Target *parent, BareMetalRunConfiguration *source); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; QString defaultDisplayName(); void setDisabledReason(const QString &reason) const; diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h index 48a2f234b1f..b6ecbc6d4ec 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h @@ -57,32 +57,32 @@ class CMakeRunConfiguration : public ProjectExplorer::LocalApplicationRunConfigu public: CMakeRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &target, const QString &workingDirectory, const QString &title); - ~CMakeRunConfiguration(); + ~CMakeRunConfiguration() override; - QString executable() const; - ProjectExplorer::ApplicationLauncher::Mode runMode() const; - QString workingDirectory() const; - QString commandLineArguments() const; - QWidget *createConfigurationWidget(); + QString executable() const override; + ProjectExplorer::ApplicationLauncher::Mode runMode() const override; + QString workingDirectory() const override; + QString commandLineArguments() const override; + QWidget *createConfigurationWidget() override; void setExecutable(const QString &executable); void setBaseWorkingDirectory(const QString &workingDirectory); QString title() const; - QVariantMap toMap() const; + QVariantMap toMap() const override; void setEnabled(bool b); - bool isEnabled() const; - QString disabledReason() const; + bool isEnabled() const override; + QString disabledReason() const override; signals: void baseWorkingDirectoryChanged(const QString&); protected: CMakeRunConfiguration(ProjectExplorer::Target *parent, CMakeRunConfiguration *source); - virtual bool fromMap(const QVariantMap &map); + virtual bool fromMap(const QVariantMap &map) override; QString defaultDisplayName() const; private: diff --git a/src/plugins/cmakeprojectmanager/makestep.h b/src/plugins/cmakeprojectmanager/makestep.h index d82f44d6f3a..8b472441eac 100644 --- a/src/plugins/cmakeprojectmanager/makestep.h +++ b/src/plugins/cmakeprojectmanager/makestep.h @@ -55,17 +55,17 @@ class MakeStep : public ProjectExplorer::AbstractProcessStep friend class MakeStepFactory; public: - MakeStep(ProjectExplorer::BuildStepList *bsl); - virtual ~MakeStep(); + explicit MakeStep(ProjectExplorer::BuildStepList *bsl); + ~MakeStep() override; CMakeBuildConfiguration *cmakeBuildConfiguration() const; - virtual bool init(); + bool init() override; - virtual void run(QFutureInterface<bool> &fi); + void run(QFutureInterface<bool> &fi) override; - virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - virtual bool immutable() const; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override; QStringList buildTargets() const; bool buildsBuildTarget(const QString &target) const; @@ -80,7 +80,7 @@ public: void setClean(bool clean); - QVariantMap toMap() const; + QVariantMap toMap() const override; void setUserMakeCommand(const QString &make); QString userMakeCommand() const; @@ -93,16 +93,16 @@ signals: void targetsToBuildChanged(); protected: - void processStarted(); - void processFinished(int exitCode, QProcess::ExitStatus status); + void processStarted() override; + void processFinished(int exitCode, QProcess::ExitStatus status) override; MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs); MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; // For parsing [ 76%] - virtual void stdOutput(const QString &line); + virtual void stdOutput(const QString &line) override; private: void ctor(); diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h index 5a14a610e15..91b79393e0c 100644 --- a/src/plugins/genericprojectmanager/genericmakestep.h +++ b/src/plugins/genericprojectmanager/genericmakestep.h @@ -52,14 +52,14 @@ class GenericMakeStep : public ProjectExplorer::AbstractProcessStep friend class GenericMakeStepFactory; public: - GenericMakeStep(ProjectExplorer::BuildStepList *parent); - ~GenericMakeStep(); + explicit GenericMakeStep(ProjectExplorer::BuildStepList *parent); + ~GenericMakeStep() override; - bool init(); - void run(QFutureInterface<bool> &fi); + bool init() override; + void run(QFutureInterface<bool> &fi) override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool immutable() const; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override; bool buildsTarget(const QString &target) const; void setBuildTarget(const QString &target, bool on); QString allArguments() const; @@ -68,12 +68,12 @@ public: void setClean(bool clean); bool isClean() const; - QVariantMap toMap() const; + QVariantMap toMap() const override; protected: GenericMakeStep(ProjectExplorer::BuildStepList *parent, GenericMakeStep *bs); GenericMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; private: void ctor(); diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h index 71b3a9e0a44..08f7d5609da 100644 --- a/src/plugins/ios/iosbuildstep.h +++ b/src/plugins/ios/iosbuildstep.h @@ -51,8 +51,8 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep friend class IosBuildStepFactory; public: - IosBuildStep(ProjectExplorer::BuildStepList *parent); - ~IosBuildStep(); + explicit IosBuildStep(ProjectExplorer::BuildStepList *parent); + ~IosBuildStep() override; bool init() override; void run(QFutureInterface<bool> &fi) override; diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h index 76d699943d2..2e5d8773d4e 100644 --- a/src/plugins/ios/iosdeploystep.h +++ b/src/plugins/ios/iosdeploystep.h @@ -64,9 +64,9 @@ public: }; friend class IosDeployStepFactory; - IosDeployStep(ProjectExplorer::BuildStepList *bc); + explicit IosDeployStep(ProjectExplorer::BuildStepList *bc); - ~IosDeployStep(); + ~IosDeployStep() override; bool fromMap(const QVariantMap &map) override; QVariantMap toMap() const override; diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h index c3045404c9d..ff5b3109d86 100644 --- a/src/plugins/ios/iosdsymbuildstep.h +++ b/src/plugins/ios/iosdsymbuildstep.h @@ -47,7 +47,7 @@ class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep friend class IosPresetBuildStepFactory; public: - ~IosPresetBuildStep(); + ~IosPresetBuildStep() override; bool init() override; void run(QFutureInterface<bool> &fi) override; diff --git a/src/plugins/projectexplorer/abstractprocessstep.h b/src/plugins/projectexplorer/abstractprocessstep.h index a79ebd2db5e..c329c6892b0 100644 --- a/src/plugins/projectexplorer/abstractprocessstep.h +++ b/src/plugins/projectexplorer/abstractprocessstep.h @@ -52,11 +52,11 @@ class PROJECTEXPLORER_EXPORT AbstractProcessStep : public BuildStep Q_OBJECT public: - virtual ~AbstractProcessStep(); + ~AbstractProcessStep() override; - virtual bool init(); - virtual void run(QFutureInterface<bool> &); - bool runInGuiThread() const { return true; } + bool init() override; + void run(QFutureInterface<bool> &) override; + bool runInGuiThread() const override { return true; } ProcessParameters *processParameters() { return &m_param; } diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index 81d2f05a7b6..731a99a50d7 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -53,7 +53,7 @@ class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration public: // ctors are protected - virtual ~BuildConfiguration(); + ~BuildConfiguration() override; Utils::FileName buildDirectory() const; Utils::FileName rawBuildDirectory() const; @@ -75,8 +75,8 @@ public: QList<Core::Id> knownStepLists() const; BuildStepList *stepList(Core::Id id) const; - virtual bool fromMap(const QVariantMap &map); - virtual QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; Target *target() const; diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h index bfd0dfd6167..e550fbd6bf2 100644 --- a/src/plugins/projectexplorer/buildstep.h +++ b/src/plugins/projectexplorer/buildstep.h @@ -56,7 +56,7 @@ protected: BuildStep(BuildStepList *bsl, BuildStep *bs); public: - virtual ~BuildStep(); + ~BuildStep() override; virtual bool init() = 0; @@ -68,8 +68,8 @@ public: virtual bool runInGuiThread() const; virtual void cancel(); - virtual bool fromMap(const QVariantMap &map); - virtual QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; bool enabled() const; void setEnabled(bool b); diff --git a/src/plugins/projectexplorer/buildsteplist.h b/src/plugins/projectexplorer/buildsteplist.h index e646b13fb10..4647f4f78d3 100644 --- a/src/plugins/projectexplorer/buildsteplist.h +++ b/src/plugins/projectexplorer/buildsteplist.h @@ -50,7 +50,7 @@ public: BuildStepList(QObject *parent, Core::Id id); BuildStepList(QObject *parent, BuildStepList *source); BuildStepList(QObject *parent, const QVariantMap &data); - virtual ~BuildStepList(); + ~BuildStepList() override; QList<BuildStep *> steps() const; bool isNull() const; @@ -66,7 +66,7 @@ public: Target *target() const; - virtual QVariantMap toMap() const; + virtual QVariantMap toMap() const override; void cloneSteps(BuildStepList *source); signals: @@ -76,7 +76,7 @@ signals: void stepMoved(int from, int to); protected: - virtual bool fromMap(const QVariantMap &map); + virtual bool fromMap(const QVariantMap &map) override; private: QList<BuildStep *> m_steps; diff --git a/src/plugins/projectexplorer/deployconfiguration.h b/src/plugins/projectexplorer/deployconfiguration.h index bf997d06520..96f55288820 100644 --- a/src/plugins/projectexplorer/deployconfiguration.h +++ b/src/plugins/projectexplorer/deployconfiguration.h @@ -52,12 +52,12 @@ class PROJECTEXPLORER_EXPORT DeployConfiguration : public ProjectConfiguration public: // ctors are protected - virtual ~DeployConfiguration(); + ~DeployConfiguration() override; BuildStepList *stepList() const; - virtual bool fromMap(const QVariantMap &map); - virtual QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; virtual NamedWidget *createConfigWidget(); diff --git a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h index 88e3d453a8a..5c4617735d4 100644 --- a/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h +++ b/src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h @@ -47,11 +47,11 @@ public: DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id); DeviceCheckBuildStep(BuildStepList *bsl, DeviceCheckBuildStep *bs); - bool init(); + bool init() override; - void run(QFutureInterface<bool> &fi); + void run(QFutureInterface<bool> &fi) override; - BuildStepConfigWidget *createConfigWidget(); + BuildStepConfigWidget *createConfigWidget() override; static Core::Id stepId(); static QString stepDisplayName(); diff --git a/src/plugins/projectexplorer/localapplicationrunconfiguration.h b/src/plugins/projectexplorer/localapplicationrunconfiguration.h index aa4fcde2937..9c0653e7cbd 100644 --- a/src/plugins/projectexplorer/localapplicationrunconfiguration.h +++ b/src/plugins/projectexplorer/localapplicationrunconfiguration.h @@ -42,7 +42,7 @@ class PROJECTEXPLORER_EXPORT LocalApplicationRunConfiguration : public RunConfig { Q_OBJECT public: - ~LocalApplicationRunConfiguration(); + ~LocalApplicationRunConfiguration() override; virtual QString executable() const = 0; virtual ApplicationLauncher::Mode runMode() const = 0; diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h index 9bb1ee02eae..ca3911f97f4 100644 --- a/src/plugins/projectexplorer/processstep.h +++ b/src/plugins/projectexplorer/processstep.h @@ -64,13 +64,13 @@ class ProcessStep : public AbstractProcessStep public: explicit ProcessStep(BuildStepList *bsl); - virtual ~ProcessStep(); + ~ProcessStep() override; - virtual bool init(); - virtual void run(QFutureInterface<bool> &); + bool init() override; + void run(QFutureInterface<bool> &) override; - virtual BuildStepConfigWidget *createConfigWidget(); - virtual bool immutable() const; + BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override; QString command() const; QString arguments() const; @@ -80,12 +80,12 @@ public: void setArguments(const QString &arguments); void setWorkingDirectory(const QString &workingDirectory); - QVariantMap toMap() const; + QVariantMap toMap() const override; protected: ProcessStep(BuildStepList *bsl, ProcessStep *bs); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; private: void ctor(); diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 3e5f18a0ee9..bfdbe01db92 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -160,7 +160,7 @@ class PROJECTEXPLORER_EXPORT RunConfiguration : public ProjectConfiguration Q_OBJECT public: - ~RunConfiguration(); + ~RunConfiguration() override; virtual bool isEnabled() const; virtual QString disabledReason() const; @@ -176,8 +176,8 @@ public: virtual Utils::OutputFormatter *createOutputFormatter() const; - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; QList<IRunConfigurationAspect *> extraAspects() const; IRunConfigurationAspect *extraAspect(Core::Id id) const; diff --git a/src/plugins/projectexplorer/target.h b/src/plugins/projectexplorer/target.h index ecdf5313122..0fbb15e5d53 100644 --- a/src/plugins/projectexplorer/target.h +++ b/src/plugins/projectexplorer/target.h @@ -60,7 +60,7 @@ class PROJECTEXPLORER_EXPORT Target : public ProjectConfiguration public: Target(Project *parent, Kit *k); - ~Target(); + ~Target() override; Project *project() const; @@ -109,7 +109,7 @@ public: QString toolTip() const; void setToolTip(const QString &text); - QVariantMap toMap() const; + QVariantMap toMap() const override; void updateDefaultBuildConfigurations(); void updateDefaultDeployConfigurations(); @@ -163,7 +163,7 @@ public slots: protected: void setEnabled(bool); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; protected slots: void updateDeviceState(); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.h b/src/plugins/qbsprojectmanager/qbsbuildstep.h index debf9c2ef64..1d06e91c175 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.h +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.h @@ -51,18 +51,18 @@ class QbsBuildStep : public ProjectExplorer::BuildStep Q_OBJECT public: - QbsBuildStep(ProjectExplorer::BuildStepList *bsl); + explicit QbsBuildStep(ProjectExplorer::BuildStepList *bsl); QbsBuildStep(ProjectExplorer::BuildStepList *bsl, const QbsBuildStep *other); - ~QbsBuildStep(); + ~QbsBuildStep() override; - bool init(); + bool init() override; - void run(QFutureInterface<bool> &fi); + void run(QFutureInterface<bool> &fi) override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; - bool runInGuiThread() const; - void cancel(); + bool runInGuiThread() const override; + void cancel() override; QVariantMap qbsConfiguration() const; void setQbsConfiguration(const QVariantMap &config); @@ -77,8 +77,8 @@ public: bool isQmlDebuggingEnabled() const; - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; signals: void qbsConfigurationChanged(); diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.h b/src/plugins/qbsprojectmanager/qbscleanstep.h index da48a47e836..9f8ba25c458 100644 --- a/src/plugins/qbsprojectmanager/qbscleanstep.h +++ b/src/plugins/qbsprojectmanager/qbscleanstep.h @@ -48,21 +48,21 @@ class QbsCleanStep : public ProjectExplorer::BuildStep Q_OBJECT public: - QbsCleanStep(ProjectExplorer::BuildStepList *bsl); + explicit QbsCleanStep(ProjectExplorer::BuildStepList *bsl); QbsCleanStep(ProjectExplorer::BuildStepList *bsl, const QbsCleanStep *other); - ~QbsCleanStep(); + ~QbsCleanStep() override; - bool init(); + bool init() override; - void run(QFutureInterface<bool> &fi); + void run(QFutureInterface<bool> &fi) override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; - bool runInGuiThread() const; - void cancel(); + bool runInGuiThread() const override; + void cancel() override; - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; bool dryRun() const; bool keepGoing() const; diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.h b/src/plugins/qbsprojectmanager/qbsinstallstep.h index 762c8add78a..c43a030e7ff 100644 --- a/src/plugins/qbsprojectmanager/qbsinstallstep.h +++ b/src/plugins/qbsprojectmanager/qbsinstallstep.h @@ -48,21 +48,21 @@ class QbsInstallStep : public ProjectExplorer::BuildStep Q_OBJECT public: - QbsInstallStep(ProjectExplorer::BuildStepList *bsl); + explicit QbsInstallStep(ProjectExplorer::BuildStepList *bsl); QbsInstallStep(ProjectExplorer::BuildStepList *bsl, const QbsInstallStep *other); - ~QbsInstallStep(); + ~QbsInstallStep() override; - bool init(); + bool init() override; - void run(QFutureInterface<bool> &fi); + void run(QFutureInterface<bool> &fi) override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; - bool runInGuiThread() const; - void cancel(); + bool runInGuiThread() const override; + void cancel() override; - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; qbs::InstallOptions installOptions() const; QString installRoot() const; diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h index 5d04c9da357..b2a97162d51 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.h +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.h @@ -73,20 +73,20 @@ class QbsRunConfiguration : public ProjectExplorer::LocalApplicationRunConfigura public: QbsRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); - bool isEnabled() const; - QString disabledReason() const; - QWidget *createConfigurationWidget(); + bool isEnabled() const override; + QString disabledReason() const override; + QWidget *createConfigurationWidget() override; - QString executable() const; - ProjectExplorer::ApplicationLauncher::Mode runMode() const; - QString workingDirectory() const; - QString commandLineArguments() const; + QString executable() const override; + ProjectExplorer::ApplicationLauncher::Mode runMode() const override; + QString workingDirectory() const override; + QString commandLineArguments() const override; - Utils::OutputFormatter *createOutputFormatter() const; + Utils::OutputFormatter *createOutputFormatter() const override; void setRunMode(ProjectExplorer::ApplicationLauncher::Mode runMode); - void addToBaseEnvironment(Utils::Environment &env) const; + void addToBaseEnvironment(Utils::Environment &env) const override; QString uniqueProductName() const; bool isConsoleApplication() const; diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h index 7b5904967eb..f0eebd40432 100644 --- a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h +++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h @@ -44,12 +44,12 @@ class AndroidPackageInstallationStep : public ProjectExplorer::AbstractProcessSt public: explicit AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl); - bool init(); + bool init() override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool immutable() const; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override; - void run(QFutureInterface<bool> &fi); + void run(QFutureInterface<bool> &fi) override; private: AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bc, AndroidPackageInstallationStep *other); diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h index fc4d7ac2638..7d8ccb1381b 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h @@ -69,22 +69,21 @@ public: Utils::FileName proFilePathForInputFile() const; void setProFilePathForInputFile(const QString &path); - protected: friend class QmakeAndroidBuildApkStepFactory; QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, QmakeAndroidBuildApkStep *other); - Utils::FileName androidPackageSourceDir() const; + Utils::FileName androidPackageSourceDir() const override; protected: void ctor(); - bool init(); - void run(QFutureInterface<bool> &fi); - void processStarted(); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool init() override; + void run(QFutureInterface<bool> &fi) override; + void processStarted() override; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; private: void setupProcessParameters(ProjectExplorer::ProcessParameters *pp, diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h index 54dc0367a70..0345d9c18aa 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h +++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h @@ -51,14 +51,14 @@ public: Utils::FileName proFilePath() const; - bool isEnabled() const; - QString disabledReason() const; + bool isEnabled() const override; + QString disabledReason() const override; protected: QmakeAndroidRunConfiguration(ProjectExplorer::Target *parent, QmakeAndroidRunConfiguration *source); - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; QString defaultDisplayName(); private slots: diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h index a518a8f74cc..88f5542e414 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h @@ -69,16 +69,16 @@ class DesktopQmakeRunConfiguration : public ProjectExplorer::LocalApplicationRun public: DesktopQmakeRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); - virtual ~DesktopQmakeRunConfiguration(); + ~DesktopQmakeRunConfiguration() override; - virtual bool isEnabled() const; - virtual QString disabledReason() const; - virtual QWidget *createConfigurationWidget(); + bool isEnabled() const override; + QString disabledReason() const override; + QWidget *createConfigurationWidget() override; - virtual QString executable() const; - virtual ProjectExplorer::ApplicationLauncher::Mode runMode() const; - virtual QString workingDirectory() const; - virtual QString commandLineArguments() const; + QString executable() const override; + ProjectExplorer::ApplicationLauncher::Mode runMode() const override; + QString workingDirectory() const override; + QString commandLineArguments() const override; bool isUsingDyldImageSuffix() const; void setUsingDyldImageSuffix(bool state); @@ -88,13 +88,13 @@ public: Utils::FileName proFilePath() const; - QVariantMap toMap() const; + QVariantMap toMap() const override; - Utils::OutputFormatter *createOutputFormatter() const; + Utils::OutputFormatter *createOutputFormatter() const override; void setRunMode(ProjectExplorer::ApplicationLauncher::Mode runMode); - void addToBaseEnvironment(Utils::Environment &env) const; + void addToBaseEnvironment(Utils::Environment &env) const override; signals: void commandLineArgumentsChanged(const QString&); void baseWorkingDirectoryChanged(const QString&); @@ -111,7 +111,7 @@ private slots: protected: DesktopQmakeRunConfiguration(ProjectExplorer::Target *parent, DesktopQmakeRunConfiguration *source); - virtual bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; private: QPair<QString, QString> extractWorkingDirAndExecutable(const QmakeProFileNode *node) const; diff --git a/src/plugins/qmakeprojectmanager/makestep.h b/src/plugins/qmakeprojectmanager/makestep.h index 7586d989f92..9b652f5d93e 100644 --- a/src/plugins/qmakeprojectmanager/makestep.h +++ b/src/plugins/qmakeprojectmanager/makestep.h @@ -80,22 +80,22 @@ class QMAKEPROJECTMANAGER_EXPORT MakeStep : public ProjectExplorer::AbstractProc public: explicit MakeStep(ProjectExplorer::BuildStepList *bsl); - virtual ~MakeStep(); + ~MakeStep() override; QmakeBuildConfiguration *qmakeBuildConfiguration() const; - virtual bool init(); - virtual void run(QFutureInterface<bool> &); + bool init() override; + void run(QFutureInterface<bool> &) override; - virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - virtual bool immutable() const; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override; QString userArguments(); void setUserArguments(const QString &arguments); void setClean(bool clean); bool isClean() const; QString makeCommand() const; - QVariantMap toMap() const; + QVariantMap toMap() const override; signals: void userArgumentsChanged(); @@ -103,7 +103,7 @@ signals: protected: MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs); MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); - virtual bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; private: void ctor(); diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index 2c20b952605..f314433297e 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -129,13 +129,13 @@ class QMAKEPROJECTMANAGER_EXPORT QMakeStep : public ProjectExplorer::AbstractPro public: explicit QMakeStep(ProjectExplorer::BuildStepList *parent); - virtual ~QMakeStep(); + ~QMakeStep() override; QmakeBuildConfiguration *qmakeBuildConfiguration() const; - virtual bool init(); - virtual void run(QFutureInterface<bool> &); - virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - virtual bool immutable() const; + bool init() override; + void run(QFutureInterface<bool> &) override; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool immutable() const override; void setForced(bool b); bool forced(); @@ -155,7 +155,7 @@ public: bool separateDebugInfo() const; void setSeparateDebugInfo(bool enable); - QVariantMap toMap() const; + QVariantMap toMap() const override; signals: void userArgumentsChanged(); @@ -166,10 +166,10 @@ signals: protected: QMakeStep(ProjectExplorer::BuildStepList *parent, QMakeStep *source); QMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id); - virtual bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; - virtual void processStartupFailed(); - virtual bool processSucceeded(int exitCode, QProcess::ExitStatus status); + void processStartupFailed() override; + bool processSucceeded(int exitCode, QProcess::ExitStatus status) override; private: void ctor(); diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index 29b5c4aafb6..67b3f24733a 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -61,11 +61,11 @@ class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplor public: QmlProjectRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); - QString executable() const; - ProjectExplorer::ApplicationLauncher::Mode runMode() const; - QString commandLineArguments() const; + QString executable() const override; + ProjectExplorer::ApplicationLauncher::Mode runMode() const override; + QString commandLineArguments() const override; - QString workingDirectory() const; + QString workingDirectory() const override; QtSupport::BaseQtVersion *qtVersion() const; enum MainScriptSource { @@ -79,13 +79,13 @@ public: QString mainScript() const; // RunConfiguration - bool isEnabled() const; - QString disabledReason() const; - virtual QWidget *createConfigurationWidget(); - Utils::OutputFormatter *createOutputFormatter() const; - QVariantMap toMap() const; + bool isEnabled() const override; + QString disabledReason() const override; + virtual QWidget *createConfigurationWidget() override; + Utils::OutputFormatter *createOutputFormatter() const override; + QVariantMap toMap() const override; - ProjectExplorer::Abi abi() const; + ProjectExplorer::Abi abi() const override; signals: void scriptSourceChanged(); @@ -96,7 +96,7 @@ private slots: protected: QmlProjectRunConfiguration(ProjectExplorer::Target *parent, QmlProjectRunConfiguration *source); - virtual bool fromMap(const QVariantMap &map); + virtual bool fromMap(const QVariantMap &map) override; void setEnabled(bool value); private: diff --git a/src/plugins/qnx/qnxrunconfiguration.h b/src/plugins/qnx/qnxrunconfiguration.h index c7babdb127c..2ba8f89a738 100644 --- a/src/plugins/qnx/qnxrunconfiguration.h +++ b/src/plugins/qnx/qnxrunconfiguration.h @@ -45,21 +45,20 @@ class QnxRunConfiguration : public RemoteLinux::RemoteLinuxRunConfiguration Q_OBJECT public: QnxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, - const QString &targetName); + const QString &targetName); - Utils::Environment environment() const; + Utils::Environment environment() const override; - QWidget *createConfigurationWidget(); + QWidget *createConfigurationWidget() override; - QVariantMap toMap() const; + QVariantMap toMap() const override; protected: friend class QnxRunConfigurationFactory; - QnxRunConfiguration(ProjectExplorer::Target *parent, - QnxRunConfiguration *source); + QnxRunConfiguration(ProjectExplorer::Target *parent, QnxRunConfiguration *source); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; private slots: void setQtLibPath(const QString &path); diff --git a/src/plugins/qtsupport/customexecutablerunconfiguration.h b/src/plugins/qtsupport/customexecutablerunconfiguration.h index 2e6817db4b3..31338a62635 100644 --- a/src/plugins/qtsupport/customexecutablerunconfiguration.h +++ b/src/plugins/qtsupport/customexecutablerunconfiguration.h @@ -53,29 +53,29 @@ class QTSUPPORT_EXPORT CustomExecutableRunConfiguration : public ProjectExplorer public: explicit CustomExecutableRunConfiguration(ProjectExplorer::Target *parent); - ~CustomExecutableRunConfiguration(); + ~CustomExecutableRunConfiguration() override; /** * Returns the executable, looks in the environment for it and might even * ask the user if none is specified */ - QString executable() const; + QString executable() const override; /** Returns whether this runconfiguration ever was configured with an executable */ - bool isConfigured() const; + bool isConfigured() const override; - ProjectExplorer::ApplicationLauncher::Mode runMode() const; - QString workingDirectory() const; - QString commandLineArguments() const; + ProjectExplorer::ApplicationLauncher::Mode runMode() const override; + QString workingDirectory() const override; + QString commandLineArguments() const override; - QWidget *createConfigurationWidget(); + QWidget *createConfigurationWidget() override; - ProjectExplorer::Abi abi() const; + ProjectExplorer::Abi abi() const override; - QVariantMap toMap() const; + QVariantMap toMap() const override; - ConfigurationState ensureConfigured(QString *errorMessage); + ConfigurationState ensureConfigured(QString *errorMessage) override; signals: void changed(); @@ -83,7 +83,7 @@ signals: protected: CustomExecutableRunConfiguration(ProjectExplorer::Target *parent, CustomExecutableRunConfiguration *source); - virtual bool fromMap(const QVariantMap &map); + virtual bool fromMap(const QVariantMap &map) override; QString defaultDisplayName() const; private slots: diff --git a/src/plugins/remotelinux/abstractpackagingstep.h b/src/plugins/remotelinux/abstractpackagingstep.h index 88c177ec07f..5767cb4f017 100644 --- a/src/plugins/remotelinux/abstractpackagingstep.h +++ b/src/plugins/remotelinux/abstractpackagingstep.h @@ -46,11 +46,11 @@ class REMOTELINUX_EXPORT AbstractPackagingStep : public ProjectExplorer::BuildSt public: AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, AbstractPackagingStep *other); - ~AbstractPackagingStep(); + ~AbstractPackagingStep() override; QString packageFilePath() const; QString cachedPackageFilePath() const; - bool init(); + bool init() override; signals: void packageFilePathChanged(); diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h index 4bd3ea89d9d..10519826981 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h @@ -47,14 +47,14 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxDeployStep : public ProjectExplorer: Q_OBJECT public: - ~AbstractRemoteLinuxDeployStep(); - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; - bool init(); - void run(QFutureInterface<bool> &fi); - bool runInGuiThread() const { return true; } - void cancel(); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + ~AbstractRemoteLinuxDeployStep() override; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; + bool init() override; + void run(QFutureInterface<bool> &fi) override; + bool runInGuiThread() const override { return true; } + void cancel() override; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; RemoteLinuxDeployConfiguration *deployConfiguration() const; virtual AbstractRemoteLinuxDeployService *deployService() const = 0; diff --git a/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.h b/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.h index 597456dfab4..24d17df89c5 100644 --- a/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.h +++ b/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.h @@ -48,7 +48,7 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxRunConfiguration : public: AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); - ~AbstractRemoteLinuxRunConfiguration(); + ~AbstractRemoteLinuxRunConfiguration() override; virtual QString localExecutableFilePath() const = 0; virtual QString remoteExecutableFilePath() const = 0; diff --git a/src/plugins/remotelinux/genericdirectuploadstep.h b/src/plugins/remotelinux/genericdirectuploadstep.h index e7c4da2d8e0..7ca49d251f9 100644 --- a/src/plugins/remotelinux/genericdirectuploadstep.h +++ b/src/plugins/remotelinux/genericdirectuploadstep.h @@ -44,10 +44,10 @@ class REMOTELINUX_EXPORT GenericDirectUploadStep : public AbstractRemoteLinuxDep public: GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, GenericDirectUploadStep *other); - ~GenericDirectUploadStep(); + ~GenericDirectUploadStep() override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool initInternal(QString *error = 0); + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool initInternal(QString *error = 0) override; void setIncrementalDeployment(bool incremental); bool incrementalDeployment() const; @@ -59,9 +59,9 @@ public: static QString displayName(); private: - GenericDirectUploadService *deployService() const; - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + GenericDirectUploadService *deployService() const override; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; void ctor(); diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h index 0e1c34c6814..e87609129d2 100644 --- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h +++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h @@ -43,7 +43,7 @@ public: Core::Id id = stepId()); RemoteLinuxCheckForFreeDiskSpaceStep(ProjectExplorer::BuildStepList *bsl, RemoteLinuxCheckForFreeDiskSpaceStep *other); - ~RemoteLinuxCheckForFreeDiskSpaceStep(); + ~RemoteLinuxCheckForFreeDiskSpaceStep() override; void setPathToCheck(const QString &path); QString pathToCheck() const; @@ -55,12 +55,12 @@ public: static QString stepDisplayName(); protected: - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; - bool initInternal(QString *error); - AbstractRemoteLinuxDeployService *deployService() const; + bool initInternal(QString *error) override; + AbstractRemoteLinuxDeployService *deployService() const override; private: void ctor(); diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h index 7f0591ce2a4..dedb8864781 100644 --- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h +++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h @@ -45,10 +45,10 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxCustomCommandDeploymentStep { Q_OBJECT public: - ~AbstractRemoteLinuxCustomCommandDeploymentStep(); + ~AbstractRemoteLinuxCustomCommandDeploymentStep() override; - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; void setCommandLine(const QString &commandLine); QString commandLine() const; @@ -58,13 +58,13 @@ protected: AbstractRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, AbstractRemoteLinuxCustomCommandDeploymentStep *other); - bool initInternal(QString *error = 0); + bool initInternal(QString *error = 0) override; private: void ctor(); - RemoteLinuxCustomCommandDeployService *deployService() const = 0; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + RemoteLinuxCustomCommandDeployService *deployService() const override = 0; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; Internal::AbstractRemoteLinuxCustomCommandDeploymentStepPrivate *d; }; @@ -75,16 +75,16 @@ class REMOTELINUX_EXPORT GenericRemoteLinuxCustomCommandDeploymentStep { Q_OBJECT public: - GenericRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl); + explicit GenericRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl); GenericRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, GenericRemoteLinuxCustomCommandDeploymentStep *other); - ~GenericRemoteLinuxCustomCommandDeploymentStep(); + ~GenericRemoteLinuxCustomCommandDeploymentStep() override; static Core::Id stepId(); static QString stepDisplayName(); private: - RemoteLinuxCustomCommandDeployService *deployService() const; + RemoteLinuxCustomCommandDeployService *deployService() const override; void ctor(); Internal::GenericRemoteLinuxCustomCommandDeploymentStepPrivate *d; diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h index 0d0d9b4fe0c..68e0fa665ba 100644 --- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h @@ -44,20 +44,20 @@ public: RemoteLinuxCustomRunConfiguration(ProjectExplorer::Target *parent, RemoteLinuxCustomRunConfiguration *source); - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; - bool isEnabled() const { return true; } - bool isConfigured() const; - ConfigurationState ensureConfigured(QString *errorMessage); - QWidget *createConfigurationWidget(); - Utils::OutputFormatter *createOutputFormatter() const; + bool isEnabled() const override { return true; } + bool isConfigured() const override; + ConfigurationState ensureConfigured(QString *errorMessage) override; + QWidget *createConfigurationWidget() override; + Utils::OutputFormatter *createOutputFormatter() const override; - QString localExecutableFilePath() const { return m_localExecutable; } - QString remoteExecutableFilePath() const { return m_remoteExecutable; } - QStringList arguments() const { return m_arguments; } - QString workingDirectory() const { return m_workingDirectory; } - Utils::Environment environment() const; + QString localExecutableFilePath() const override { return m_localExecutable; } + QString remoteExecutableFilePath() const override { return m_remoteExecutable; } + QStringList arguments() const override { return m_arguments; } + QString workingDirectory() const override { return m_workingDirectory; } + Utils::Environment environment() const override; void setLocalExecutableFilePath(const QString &executable) { m_localExecutable = executable; } void setRemoteExecutableFilePath(const QString &executable); diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h index c9b10266fef..e61190dadde 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h @@ -50,7 +50,7 @@ public: RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, RemoteLinuxDeployConfiguration *source); - ProjectExplorer::NamedWidget *createConfigWidget(); + ProjectExplorer::NamedWidget *createConfigWidget() override; template<class T> T *earlierBuildStep(const ProjectExplorer::BuildStep *laterBuildStep) const { diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h index dac5d61da15..0942696f7b6 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h @@ -61,28 +61,28 @@ class REMOTELINUX_EXPORT RemoteLinuxRunConfiguration : public AbstractRemoteLinu public: RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, - const QString &targetName); - ~RemoteLinuxRunConfiguration(); + const QString &targetName); + ~RemoteLinuxRunConfiguration() override; - bool isEnabled() const; - QWidget *createConfigurationWidget(); - Utils::OutputFormatter *createOutputFormatter() const; + bool isEnabled() const override; + QWidget *createConfigurationWidget() override; + Utils::OutputFormatter *createOutputFormatter() const override; - virtual Utils::Environment environment() const; + virtual Utils::Environment environment() const override; - QString localExecutableFilePath() const; + QString localExecutableFilePath() const override; QString defaultRemoteExecutableFilePath() const; - QString remoteExecutableFilePath() const; - QStringList arguments() const; + QString remoteExecutableFilePath() const override; + QStringList arguments() const override; void setArguments(const QString &args); - QString workingDirectory() const; + QString workingDirectory() const override; void setWorkingDirectory(const QString &wd); void setAlternateRemoteExecutable(const QString &exe); QString alternateRemoteExecutable() const; void setUseAlternateExecutable(bool useAlternate); bool useAlternateExecutable() const; - QVariantMap toMap() const; + QVariantMap toMap() const override; static const char *IdPrefix; @@ -93,7 +93,7 @@ signals: protected: RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, RemoteLinuxRunConfiguration *source); - bool fromMap(const QVariantMap &map); + bool fromMap(const QVariantMap &map) override; QString defaultDisplayName(); protected slots: diff --git a/src/plugins/remotelinux/tarpackagecreationstep.h b/src/plugins/remotelinux/tarpackagecreationstep.h index 18e89010766..4bfa3a3d777 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.h +++ b/src/plugins/remotelinux/tarpackagecreationstep.h @@ -52,18 +52,18 @@ public: static Core::Id stepId(); static QString displayName(); - bool init(); - void run(QFutureInterface<bool> &fi); + bool init() override; + void run(QFutureInterface<bool> &fi) override; void setIgnoreMissingFiles(bool ignoreMissingFiles); bool ignoreMissingFiles() const; private: - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; - QString packageFileName() const; + QString packageFileName() const override; void ctor(); bool doPackage(QFutureInterface<bool> &fi); diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h index 2714bae19af..fe7f3d5fe1e 100644 --- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.h +++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.h @@ -62,15 +62,15 @@ public: UploadAndInstallTarPackageStep(ProjectExplorer::BuildStepList *bsl, UploadAndInstallTarPackageStep *other); - bool initInternal(QString *error = 0); + bool initInternal(QString *error = 0) override; - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; static Core::Id stepId(); static QString displayName(); private: - AbstractRemoteLinuxDeployService *deployService() const { return m_deployService; } + AbstractRemoteLinuxDeployService *deployService() const override { return m_deployService; } void ctor(); diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.h b/src/plugins/winrt/winrtpackagedeploymentstep.h index 0ddff23659f..bbbd93ad100 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.h +++ b/src/plugins/winrt/winrtpackagedeploymentstep.h @@ -41,11 +41,11 @@ class WinRtPackageDeploymentStep : public ProjectExplorer::AbstractProcessStep Q_OBJECT public: explicit WinRtPackageDeploymentStep(ProjectExplorer::BuildStepList *bsl); - bool init(); - void run(QFutureInterface<bool> &fi); - bool processSucceeded(int exitCode, QProcess::ExitStatus status); - void stdOutput(const QString &line); - ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); + bool init() override; + void run(QFutureInterface<bool> &fi) override; + bool processSucceeded(int exitCode, QProcess::ExitStatus status) override; + void stdOutput(const QString &line) override; + ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override; void setWinDeployQtArguments(const QString &args); QString winDeployQtArguments() const; @@ -54,8 +54,8 @@ public: void raiseError(const QString &errorMessage); void raiseWarning(const QString &warningMessage); - bool fromMap(const QVariantMap &map); - QVariantMap toMap() const; + bool fromMap(const QVariantMap &map) override; + QVariantMap toMap() const override; private: bool parseIconsAndExecutableFromManifest(QString manifestFileName, QStringList *items, QString *executable); diff --git a/src/plugins/winrt/winrtrunconfiguration.h b/src/plugins/winrt/winrtrunconfiguration.h index 7fecf95534e..e37deadd28d 100644 --- a/src/plugins/winrt/winrtrunconfiguration.h +++ b/src/plugins/winrt/winrtrunconfiguration.h @@ -43,10 +43,10 @@ class WinRtRunConfiguration : public ProjectExplorer::RunConfiguration public: explicit WinRtRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); - QWidget *createConfigurationWidget(); - bool isEnabled() const { return true; } // Always enabled like DLL run control - QVariantMap toMap() const; - bool fromMap(const QVariantMap &map); + QWidget *createConfigurationWidget() override; + bool isEnabled() const override { return true; } // Always enabled like DLL run control + QVariantMap toMap() const override; + bool fromMap(const QVariantMap &map) override; const QString &proFilePath() const { return m_proFilePath; } const QString &arguments() const { return m_arguments; } |