feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectConfiguration: Sprinkle override and explicit over the code

Browse Source 
Change-Id: I2aa3a32a0d30f1d122977d94d4109227dea6bbd7
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-13 11:06:27 +01:00
parent ca29cbfc8a
commit 0e278e9efe
52 changed files with 318 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/android/androidbuildapkstep.h
View File

@@ -54,8 +54,8 @@ public:
BundleLibrariesDeployment BundleLibrariesDeployment
}; };
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
AndroidDeployAction deployAction() const; AndroidDeployAction deployAction() const;
@@ -79,7 +79,7 @@ public:
bool useGradle() const; bool useGradle() const;
void setUseGradle(bool b); void setUseGradle(bool b);
bool runInGuiThread() const; bool runInGuiThread() const override;
QString buildTargetSdk() const; QString buildTargetSdk() const;
void setBuildTargetSdk(const QString &sdk); void setBuildTargetSdk(const QString &sdk);
@@ -97,10 +97,10 @@ protected:
bool keystorePassword(); bool keystorePassword();
bool certificatePassword(); bool certificatePassword();
bool init(); bool init() override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool immutable() const { return true; } bool immutable() const override { return true; }
void processFinished(int exitCode, QProcess::ExitStatus status); void processFinished(int exitCode, QProcess::ExitStatus status) override;
protected: protected:
AndroidDeployAction m_deployAction; AndroidDeployAction m_deployAction;

16
src/plugins/android/androiddeployqtstep.h
View File

@@ -81,12 +81,12 @@ public:
ForceUnintall ForceUnintall
}; };
public: public:
AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc); explicit AndroidDeployQtStep(ProjectExplorer::BuildStepList *bc);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
bool runInGuiThread() const; bool runInGuiThread() const override;
UninstallType uninstallPreviousPackage(); UninstallType uninstallPreviousPackage();
@@ -103,15 +103,15 @@ private:
void ctor(); void ctor();
void runCommand(const QString &program, const QStringList &arguments); void runCommand(const QString &program, const QStringList &arguments);
bool init(); bool init() override;
void run(QFutureInterface<bool> &fi); void run(QFutureInterface<bool> &fi) override;
enum DeployResult { Success, Failure, AskUinstall }; enum DeployResult { Success, Failure, AskUinstall };
DeployResult runDeploy(QFutureInterface<bool> &fi); DeployResult runDeploy(QFutureInterface<bool> &fi);
void slotAskForUninstall(); void slotAskForUninstall();
void slotSetSerialNumber(const QString &serialNumber); void slotSetSerialNumber(const QString &serialNumber);
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool immutable() const { return true; } bool immutable() const override { return true; }
void processReadyReadStdOutput(); void processReadyReadStdOutput();
void stdOutput(const QString &line); void stdOutput(const QString &line);

4
src/plugins/android/androidrunconfiguration.h
View File

@@ -43,8 +43,8 @@ class ANDROID_EXPORT AndroidRunConfiguration : public ProjectExplorer::RunConfig
public: public:
AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); AndroidRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget() override;
Utils::OutputFormatter *createOutputFormatter() const; Utils::OutputFormatter *createOutputFormatter() const override;
const QString remoteChannel() const; const QString remoteChannel() const;
protected: protected:

14
src/plugins/autotoolsprojectmanager/autogenstep.h
View File

@@ -94,14 +94,14 @@ class AutogenStep : public ProjectExplorer::AbstractProcessStep
friend class AutogenStepConfigWidget; friend class AutogenStepConfigWidget;
public: public:
AutogenStep(ProjectExplorer::BuildStepList *bsl); explicit AutogenStep(ProjectExplorer::BuildStepList *bsl);
bool init(); bool init() override;
void run(QFutureInterface<bool> &interface); void run(QFutureInterface<bool> &interface) override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool immutable() const; bool immutable() const override;
QString additionalArguments() const; QString additionalArguments() const;
QVariantMap toMap() const; QVariantMap toMap() const override;
public slots: public slots:
void setAdditionalArguments(const QString &list); void setAdditionalArguments(const QString &list);
@@ -113,7 +113,7 @@ protected:
AutogenStep(ProjectExplorer::BuildStepList *bsl, AutogenStep *bs); AutogenStep(ProjectExplorer::BuildStepList *bsl, AutogenStep *bs);
AutogenStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); AutogenStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
private: private:
void ctor(); void ctor();

14
src/plugins/autotoolsprojectmanager/autoreconfstep.h
View File

@@ -94,14 +94,14 @@ class AutoreconfStep : public ProjectExplorer::AbstractProcessStep
friend class AutoreconfStepConfigWidget; friend class AutoreconfStepConfigWidget;
public: public:
AutoreconfStep(ProjectExplorer::BuildStepList *bsl); explicit AutoreconfStep(ProjectExplorer::BuildStepList *bsl);
bool init(); bool init() override;
void run(QFutureInterface<bool> &interface); void run(QFutureInterface<bool> &interface) override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool immutable() const; bool immutable() const override;
QString additionalArguments() const; QString additionalArguments() const;
QVariantMap toMap() const; QVariantMap toMap() const override;
public slots: public slots:
void setAdditionalArguments(const QString &list); void setAdditionalArguments(const QString &list);
@@ -113,7 +113,7 @@ protected:
AutoreconfStep(ProjectExplorer::BuildStepList *bsl, AutoreconfStep *bs); AutoreconfStep(ProjectExplorer::BuildStepList *bsl, AutoreconfStep *bs);
AutoreconfStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); AutoreconfStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
private: private:
void ctor(); void ctor();

14
src/plugins/autotoolsprojectmanager/configurestep.h
View File

@@ -93,14 +93,14 @@ class ConfigureStep : public ProjectExplorer::AbstractProcessStep
friend class ConfigureStepConfigWidget; friend class ConfigureStepConfigWidget;
public: public:
ConfigureStep(ProjectExplorer::BuildStepList *bsl); explicit ConfigureStep(ProjectExplorer::BuildStepList *bsl);
bool init(); bool init() override;
void run(QFutureInterface<bool> &interface); void run(QFutureInterface<bool> &interface) override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool immutable() const; bool immutable() const override;
QString additionalArguments() const; QString additionalArguments() const;
QVariantMap toMap() const; QVariantMap toMap() const override;
public slots: public slots:
void setAdditionalArguments(const QString &list); void setAdditionalArguments(const QString &list);
@@ -114,7 +114,7 @@ protected:
ConfigureStep(ProjectExplorer::BuildStepList *bsl, ConfigureStep *bs); ConfigureStep(ProjectExplorer::BuildStepList *bsl, ConfigureStep *bs);
ConfigureStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); ConfigureStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
private: private:
void ctor(); void ctor();

14
src/plugins/autotoolsprojectmanager/makestep.h
View File

@@ -92,16 +92,16 @@ class MakeStep : public ProjectExplorer::AbstractProcessStep
friend class MakeStepConfigWidget; friend class MakeStepConfigWidget;
public: public:
MakeStep(ProjectExplorer::BuildStepList *bsl); explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
bool init(); bool init() override;
void run(QFutureInterface<bool> &interface); void run(QFutureInterface<bool> &interface) override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
void setClean(bool clean); void setClean(bool clean);
bool immutable() const; bool immutable() const override;
void setBuildTarget(const QString &target, bool on); void setBuildTarget(const QString &target, bool on);
QString additionalArguments() const; QString additionalArguments() const;
QVariantMap toMap() const; QVariantMap toMap() const override;
public slots: public slots:
void setAdditionalArguments(const QString &list); void setAdditionalArguments(const QString &list);
@@ -113,7 +113,7 @@ protected:
MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs); MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs);
MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
private: private:
void ctor(); void ctor();

16
src/plugins/baremetal/baremetalcustomrunconfiguration.h
View File

@@ -46,21 +46,21 @@ public:
BareMetalCustomRunConfiguration(ProjectExplorer::Target *parent, BareMetalCustomRunConfiguration(ProjectExplorer::Target *parent,
BareMetalCustomRunConfiguration *source); BareMetalCustomRunConfiguration *source);
bool isEnabled() const { return true; } bool isEnabled() const override { return true; }
bool isConfigured() const; bool isConfigured() const override;
ConfigurationState ensureConfigured(QString *errorMessage); ConfigurationState ensureConfigured(QString *errorMessage) override;
QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget() override;
Utils::OutputFormatter *createOutputFormatter() const; 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; } void setLocalExecutableFilePath(const QString &executable) { m_localExecutable = executable; }
static Core::Id runConfigId(); static Core::Id runConfigId();
static QString runConfigDefaultDisplayName(); static QString runConfigDefaultDisplayName();
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
private: private:
QString m_localExecutable; QString m_localExecutable;

14
src/plugins/baremetal/baremetalgdbcommandsdeploystep.h
View File

@@ -47,16 +47,16 @@ public:
BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl, BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl,
BareMetalGdbCommandsDeployStep *other); BareMetalGdbCommandsDeployStep *other);
~BareMetalGdbCommandsDeployStep(); ~BareMetalGdbCommandsDeployStep() override;
bool init(); bool init() override;
void run(QFutureInterface<bool> &fi); void run(QFutureInterface<bool> &fi) override;
bool runInGuiThread() const { return true;} bool runInGuiThread() const override { return true;}
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
static Core::Id stepId(); static Core::Id stepId();
static QString displayName(); static QString displayName();

12
src/plugins/baremetal/baremetalrunconfiguration.h
View File

@@ -50,10 +50,10 @@ public:
explicit BareMetalRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, explicit BareMetalRunConfiguration(ProjectExplorer::Target *parent, Core::Id id,
const QString &projectFilePath); const QString &projectFilePath);
bool isEnabled() const; bool isEnabled() const override;
QString disabledReason() const; QString disabledReason() const override;
QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget() override;
Utils::OutputFormatter *createOutputFormatter() const; Utils::OutputFormatter *createOutputFormatter() const override;
virtual QString localExecutableFilePath() const; virtual QString localExecutableFilePath() const;
QString arguments() const; QString arguments() const;
@@ -61,7 +61,7 @@ public:
QString workingDirectory() const; QString workingDirectory() const;
void setWorkingDirectory(const QString &wd); void setWorkingDirectory(const QString &wd);
QVariantMap toMap() const; QVariantMap toMap() const override;
QString projectFilePath() const; QString projectFilePath() const;
@@ -73,7 +73,7 @@ signals:
protected: protected:
BareMetalRunConfiguration(ProjectExplorer::Target *parent, BareMetalRunConfiguration *source); BareMetalRunConfiguration(ProjectExplorer::Target *parent, BareMetalRunConfiguration *source);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QString defaultDisplayName(); QString defaultDisplayName();
void setDisabledReason(const QString &reason) const; void setDisabledReason(const QString &reason) const;

20
src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
View File

@@ -57,32 +57,32 @@ class CMakeRunConfiguration : public ProjectExplorer::LocalApplicationRunConfigu
public: public:
CMakeRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &target, CMakeRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &target,
const QString &workingDirectory, const QString &title); const QString &workingDirectory, const QString &title);
~CMakeRunConfiguration(); ~CMakeRunConfiguration() override;
QString executable() const; QString executable() const override;
ProjectExplorer::ApplicationLauncher::Mode runMode() const; ProjectExplorer::ApplicationLauncher::Mode runMode() const override;
QString workingDirectory() const; QString workingDirectory() const override;
QString commandLineArguments() const; QString commandLineArguments() const override;
QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget() override;
void setExecutable(const QString &executable); void setExecutable(const QString &executable);
void setBaseWorkingDirectory(const QString &workingDirectory); void setBaseWorkingDirectory(const QString &workingDirectory);
QString title() const; QString title() const;
QVariantMap toMap() const; QVariantMap toMap() const override;
void setEnabled(bool b); void setEnabled(bool b);
bool isEnabled() const; bool isEnabled() const override;
QString disabledReason() const; QString disabledReason() const override;
signals: signals:
void baseWorkingDirectoryChanged(const QString&); void baseWorkingDirectoryChanged(const QString&);
protected: protected:
CMakeRunConfiguration(ProjectExplorer::Target *parent, CMakeRunConfiguration *source); CMakeRunConfiguration(ProjectExplorer::Target *parent, CMakeRunConfiguration *source);
virtual bool fromMap(const QVariantMap &map); virtual bool fromMap(const QVariantMap &map) override;
QString defaultDisplayName() const; QString defaultDisplayName() const;
private: private:

22
src/plugins/cmakeprojectmanager/makestep.h
View File

@@ -55,17 +55,17 @@ class MakeStep : public ProjectExplorer::AbstractProcessStep
friend class MakeStepFactory; friend class MakeStepFactory;
public: public:
MakeStep(ProjectExplorer::BuildStepList *bsl); explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
virtual ~MakeStep(); ~MakeStep() override;
CMakeBuildConfiguration *cmakeBuildConfiguration() const; 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(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
virtual bool immutable() const; bool immutable() const override;
QStringList buildTargets() const; QStringList buildTargets() const;
bool buildsBuildTarget(const QString &target) const; bool buildsBuildTarget(const QString &target) const;
@@ -80,7 +80,7 @@ public:
void setClean(bool clean); void setClean(bool clean);
QVariantMap toMap() const; QVariantMap toMap() const override;
void setUserMakeCommand(const QString &make); void setUserMakeCommand(const QString &make);
QString userMakeCommand() const; QString userMakeCommand() const;
@@ -93,16 +93,16 @@ signals:
void targetsToBuildChanged(); void targetsToBuildChanged();
protected: protected:
void processStarted(); void processStarted() override;
void processFinished(int exitCode, QProcess::ExitStatus status); void processFinished(int exitCode, QProcess::ExitStatus status) override;
MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs); MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs);
MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
// For parsing [ 76%] // For parsing [ 76%]
virtual void stdOutput(const QString &line); virtual void stdOutput(const QString &line) override;
private: private:
void ctor(); void ctor();

16
src/plugins/genericprojectmanager/genericmakestep.h
View File

@@ -52,14 +52,14 @@ class GenericMakeStep : public ProjectExplorer::AbstractProcessStep
friend class GenericMakeStepFactory; friend class GenericMakeStepFactory;
public: public:
GenericMakeStep(ProjectExplorer::BuildStepList *parent); explicit GenericMakeStep(ProjectExplorer::BuildStepList *parent);
~GenericMakeStep(); ~GenericMakeStep() 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 immutable() const; bool immutable() const override;
bool buildsTarget(const QString &target) const; bool buildsTarget(const QString &target) const;
void setBuildTarget(const QString &target, bool on); void setBuildTarget(const QString &target, bool on);
QString allArguments() const; QString allArguments() const;
@@ -68,12 +68,12 @@ public:
void setClean(bool clean); void setClean(bool clean);
bool isClean() const; bool isClean() const;
QVariantMap toMap() const; QVariantMap toMap() const override;
protected: protected:
GenericMakeStep(ProjectExplorer::BuildStepList *parent, GenericMakeStep *bs); GenericMakeStep(ProjectExplorer::BuildStepList *parent, GenericMakeStep *bs);
GenericMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id); GenericMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
private: private:
void ctor(); void ctor();

4
src/plugins/ios/iosbuildstep.h
View File

@@ -51,8 +51,8 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep
friend class IosBuildStepFactory; friend class IosBuildStepFactory;
public: public:
IosBuildStep(ProjectExplorer::BuildStepList *parent); explicit IosBuildStep(ProjectExplorer::BuildStepList *parent);
~IosBuildStep(); ~IosBuildStep() override;
bool init() override; bool init() override;
void run(QFutureInterface<bool> &fi) override; void run(QFutureInterface<bool> &fi) override;

4
src/plugins/ios/iosdeploystep.h
View File

@@ -64,9 +64,9 @@ public:
}; };
friend class IosDeployStepFactory; friend class IosDeployStepFactory;
IosDeployStep(ProjectExplorer::BuildStepList *bc); explicit IosDeployStep(ProjectExplorer::BuildStepList *bc);
~IosDeployStep(); ~IosDeployStep() override;
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override; QVariantMap toMap() const override;

2
src/plugins/ios/iosdsymbuildstep.h
View File

@@ -47,7 +47,7 @@ class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep
friend class IosPresetBuildStepFactory; friend class IosPresetBuildStepFactory;
public: public:
~IosPresetBuildStep(); ~IosPresetBuildStep() override;
bool init() override; bool init() override;
void run(QFutureInterface<bool> &fi) override; void run(QFutureInterface<bool> &fi) override;

8
src/plugins/projectexplorer/abstractprocessstep.h
View File

@@ -52,11 +52,11 @@ class PROJECTEXPLORER_EXPORT AbstractProcessStep : public BuildStep
Q_OBJECT Q_OBJECT
public: public:
virtual ~AbstractProcessStep(); ~AbstractProcessStep() override;
virtual bool init(); bool init() override;
virtual void run(QFutureInterface<bool> &); void run(QFutureInterface<bool> &) override;
bool runInGuiThread() const { return true; } bool runInGuiThread() const override { return true; }
ProcessParameters *processParameters() { return &m_param; } ProcessParameters *processParameters() { return &m_param; }

6
src/plugins/projectexplorer/buildconfiguration.h
View File

@@ -53,7 +53,7 @@ class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration
public: public:
// ctors are protected // ctors are protected
virtual ~BuildConfiguration(); ~BuildConfiguration() override;
Utils::FileName buildDirectory() const; Utils::FileName buildDirectory() const;
Utils::FileName rawBuildDirectory() const; Utils::FileName rawBuildDirectory() const;
@@ -75,8 +75,8 @@ public:
QList<Core::Id> knownStepLists() const; QList<Core::Id> knownStepLists() const;
BuildStepList *stepList(Core::Id id) const; BuildStepList *stepList(Core::Id id) const;
virtual bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
virtual QVariantMap toMap() const; QVariantMap toMap() const override;
Target *target() const; Target *target() const;

6
src/plugins/projectexplorer/buildstep.h
View File

@@ -56,7 +56,7 @@ protected:
BuildStep(BuildStepList *bsl, BuildStep *bs); BuildStep(BuildStepList *bsl, BuildStep *bs);
public: public:
virtual ~BuildStep(); ~BuildStep() override;
virtual bool init() = 0; virtual bool init() = 0;
@@ -68,8 +68,8 @@ public:
virtual bool runInGuiThread() const; virtual bool runInGuiThread() const;
virtual void cancel(); virtual void cancel();
virtual bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
virtual QVariantMap toMap() const; QVariantMap toMap() const override;
bool enabled() const; bool enabled() const;
void setEnabled(bool b); void setEnabled(bool b);

6
src/plugins/projectexplorer/buildsteplist.h
View File

@@ -50,7 +50,7 @@ public:
BuildStepList(QObject *parent, Core::Id id); BuildStepList(QObject *parent, Core::Id id);
BuildStepList(QObject *parent, BuildStepList *source); BuildStepList(QObject *parent, BuildStepList *source);
BuildStepList(QObject *parent, const QVariantMap &data); BuildStepList(QObject *parent, const QVariantMap &data);
virtual ~BuildStepList(); ~BuildStepList() override;
QList<BuildStep *> steps() const; QList<BuildStep *> steps() const;
bool isNull() const; bool isNull() const;
@@ -66,7 +66,7 @@ public:
Target *target() const; Target *target() const;
virtual QVariantMap toMap() const; virtual QVariantMap toMap() const override;
void cloneSteps(BuildStepList *source); void cloneSteps(BuildStepList *source);
signals: signals:
@@ -76,7 +76,7 @@ signals:
void stepMoved(int from, int to); void stepMoved(int from, int to);
protected: protected:
virtual bool fromMap(const QVariantMap &map); virtual bool fromMap(const QVariantMap &map) override;
private: private:
QList<BuildStep *> m_steps; QList<BuildStep *> m_steps;

6
src/plugins/projectexplorer/deployconfiguration.h
View File

@@ -52,12 +52,12 @@ class PROJECTEXPLORER_EXPORT DeployConfiguration : public ProjectConfiguration
public: public:
// ctors are protected // ctors are protected
virtual ~DeployConfiguration(); ~DeployConfiguration() override;
BuildStepList *stepList() const; BuildStepList *stepList() const;
virtual bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
virtual QVariantMap toMap() const; QVariantMap toMap() const override;
virtual NamedWidget *createConfigWidget(); virtual NamedWidget *createConfigWidget();

6
src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h
View File

@@ -47,11 +47,11 @@ public:
DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id); DeviceCheckBuildStep(BuildStepList *bsl, Core::Id id);
DeviceCheckBuildStep(BuildStepList *bsl, DeviceCheckBuildStep *bs); 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 Core::Id stepId();
static QString stepDisplayName(); static QString stepDisplayName();

2
src/plugins/projectexplorer/localapplicationrunconfiguration.h
View File

@@ -42,7 +42,7 @@ class PROJECTEXPLORER_EXPORT LocalApplicationRunConfiguration : public RunConfig
{ {
Q_OBJECT Q_OBJECT
public: public:
~LocalApplicationRunConfiguration(); ~LocalApplicationRunConfiguration() override;
virtual QString executable() const = 0; virtual QString executable() const = 0;
virtual ApplicationLauncher::Mode runMode() const = 0; virtual ApplicationLauncher::Mode runMode() const = 0;

14
src/plugins/projectexplorer/processstep.h
View File

@@ -64,13 +64,13 @@ class ProcessStep : public AbstractProcessStep
public: public:
explicit ProcessStep(BuildStepList *bsl); explicit ProcessStep(BuildStepList *bsl);
virtual ~ProcessStep(); ~ProcessStep() override;
virtual bool init(); bool init() override;
virtual void run(QFutureInterface<bool> &); void run(QFutureInterface<bool> &) override;
virtual BuildStepConfigWidget *createConfigWidget(); BuildStepConfigWidget *createConfigWidget() override;
virtual bool immutable() const; bool immutable() const override;
QString command() const; QString command() const;
QString arguments() const; QString arguments() const;
@@ -80,12 +80,12 @@ public:
void setArguments(const QString &arguments); void setArguments(const QString &arguments);
void setWorkingDirectory(const QString &workingDirectory); void setWorkingDirectory(const QString &workingDirectory);
QVariantMap toMap() const; QVariantMap toMap() const override;
protected: protected:
ProcessStep(BuildStepList *bsl, ProcessStep *bs); ProcessStep(BuildStepList *bsl, ProcessStep *bs);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
private: private:
void ctor(); void ctor();

6
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -160,7 +160,7 @@ class PROJECTEXPLORER_EXPORT RunConfiguration : public ProjectConfiguration
Q_OBJECT Q_OBJECT
public: public:
~RunConfiguration(); ~RunConfiguration() override;
virtual bool isEnabled() const; virtual bool isEnabled() const;
virtual QString disabledReason() const; virtual QString disabledReason() const;
@@ -176,8 +176,8 @@ public:
virtual Utils::OutputFormatter *createOutputFormatter() const; virtual Utils::OutputFormatter *createOutputFormatter() const;
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
QList<IRunConfigurationAspect *> extraAspects() const; QList<IRunConfigurationAspect *> extraAspects() const;
IRunConfigurationAspect *extraAspect(Core::Id id) const; IRunConfigurationAspect *extraAspect(Core::Id id) const;

6
src/plugins/projectexplorer/target.h
View File

@@ -60,7 +60,7 @@ class PROJECTEXPLORER_EXPORT Target : public ProjectConfiguration
public: public:
Target(Project *parent, Kit *k); Target(Project *parent, Kit *k);
~Target(); ~Target() override;
Project *project() const; Project *project() const;
@@ -109,7 +109,7 @@ public:
QString toolTip() const; QString toolTip() const;
void setToolTip(const QString &text); void setToolTip(const QString &text);
QVariantMap toMap() const; QVariantMap toMap() const override;
void updateDefaultBuildConfigurations(); void updateDefaultBuildConfigurations();
void updateDefaultDeployConfigurations(); void updateDefaultDeployConfigurations();
@@ -163,7 +163,7 @@ public slots:
protected: protected:
void setEnabled(bool); void setEnabled(bool);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
protected slots: protected slots:
void updateDeviceState(); void updateDeviceState();

18
src/plugins/qbsprojectmanager/qbsbuildstep.h
View File

@@ -51,18 +51,18 @@ class QbsBuildStep : public ProjectExplorer::BuildStep
Q_OBJECT Q_OBJECT
public: public:
QbsBuildStep(ProjectExplorer::BuildStepList *bsl); explicit QbsBuildStep(ProjectExplorer::BuildStepList *bsl);
QbsBuildStep(ProjectExplorer::BuildStepList *bsl, const QbsBuildStep *other); 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; bool runInGuiThread() const override;
void cancel(); void cancel() override;
QVariantMap qbsConfiguration() const; QVariantMap qbsConfiguration() const;
void setQbsConfiguration(const QVariantMap &config); void setQbsConfiguration(const QVariantMap &config);
@@ -77,8 +77,8 @@ public:
bool isQmlDebuggingEnabled() const; bool isQmlDebuggingEnabled() const;
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
signals: signals:
void qbsConfigurationChanged(); void qbsConfigurationChanged();

18
src/plugins/qbsprojectmanager/qbscleanstep.h
View File

@@ -48,21 +48,21 @@ class QbsCleanStep : public ProjectExplorer::BuildStep
Q_OBJECT Q_OBJECT
public: public:
QbsCleanStep(ProjectExplorer::BuildStepList *bsl); explicit QbsCleanStep(ProjectExplorer::BuildStepList *bsl);
QbsCleanStep(ProjectExplorer::BuildStepList *bsl, const QbsCleanStep *other); 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; bool runInGuiThread() const override;
void cancel(); void cancel() override;
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
bool dryRun() const; bool dryRun() const;
bool keepGoing() const; bool keepGoing() const;

18
src/plugins/qbsprojectmanager/qbsinstallstep.h
View File

@@ -48,21 +48,21 @@ class QbsInstallStep : public ProjectExplorer::BuildStep
Q_OBJECT Q_OBJECT
public: public:
QbsInstallStep(ProjectExplorer::BuildStepList *bsl); explicit QbsInstallStep(ProjectExplorer::BuildStepList *bsl);
QbsInstallStep(ProjectExplorer::BuildStepList *bsl, const QbsInstallStep *other); 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; bool runInGuiThread() const override;
void cancel(); void cancel() override;
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
qbs::InstallOptions installOptions() const; qbs::InstallOptions installOptions() const;
QString installRoot() const; QString installRoot() const;

18
src/plugins/qbsprojectmanager/qbsrunconfiguration.h
View File

@@ -73,20 +73,20 @@ class QbsRunConfiguration : public ProjectExplorer::LocalApplicationRunConfigura
public: public:
QbsRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); QbsRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
bool isEnabled() const; bool isEnabled() const override;
QString disabledReason() const; QString disabledReason() const override;
QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget() override;
QString executable() const; QString executable() const override;
ProjectExplorer::ApplicationLauncher::Mode runMode() const; ProjectExplorer::ApplicationLauncher::Mode runMode() const override;
QString workingDirectory() const; QString workingDirectory() const override;
QString commandLineArguments() const; QString commandLineArguments() const override;
Utils::OutputFormatter *createOutputFormatter() const; Utils::OutputFormatter *createOutputFormatter() const override;
void setRunMode(ProjectExplorer::ApplicationLauncher::Mode runMode); void setRunMode(ProjectExplorer::ApplicationLauncher::Mode runMode);
void addToBaseEnvironment(Utils::Environment &env) const; void addToBaseEnvironment(Utils::Environment &env) const override;
QString uniqueProductName() const; QString uniqueProductName() const;
bool isConsoleApplication() const; bool isConsoleApplication() const;

8
src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h
View File

@@ -44,12 +44,12 @@ class AndroidPackageInstallationStep : public ProjectExplorer::AbstractProcessSt
public: public:
explicit AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl); explicit AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bsl);
bool init(); bool init() override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool immutable() const; bool immutable() const override;
void run(QFutureInterface<bool> &fi); void run(QFutureInterface<bool> &fi) override;
private: private:
AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bc, AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bc,
AndroidPackageInstallationStep *other); AndroidPackageInstallationStep *other);

15
src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
View File

@@ -69,22 +69,21 @@ public:
Utils::FileName proFilePathForInputFile() const; Utils::FileName proFilePathForInputFile() const;
void setProFilePathForInputFile(const QString &path); void setProFilePathForInputFile(const QString &path);
protected: protected:
friend class QmakeAndroidBuildApkStepFactory; friend class QmakeAndroidBuildApkStepFactory;
QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepList *bc,
QmakeAndroidBuildApkStep *other); QmakeAndroidBuildApkStep *other);
Utils::FileName androidPackageSourceDir() const; Utils::FileName androidPackageSourceDir() const override;
protected: protected:
void ctor(); void ctor();
bool init(); bool init() override;
void run(QFutureInterface<bool> &fi); void run(QFutureInterface<bool> &fi) override;
void processStarted(); void processStarted() override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
private: private:
void setupProcessParameters(ProjectExplorer::ProcessParameters *pp, void setupProcessParameters(ProjectExplorer::ProcessParameters *pp,

8
src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
View File

@@ -51,14 +51,14 @@ public:
Utils::FileName proFilePath() const; Utils::FileName proFilePath() const;
bool isEnabled() const; bool isEnabled() const override;
QString disabledReason() const; QString disabledReason() const override;
protected: protected:
QmakeAndroidRunConfiguration(ProjectExplorer::Target *parent, QmakeAndroidRunConfiguration *source); QmakeAndroidRunConfiguration(ProjectExplorer::Target *parent, QmakeAndroidRunConfiguration *source);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
QString defaultDisplayName(); QString defaultDisplayName();
private slots: private slots:

24
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
View File

@@ -69,16 +69,16 @@ class DesktopQmakeRunConfiguration : public ProjectExplorer::LocalApplicationRun
public: public:
DesktopQmakeRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); DesktopQmakeRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
virtual ~DesktopQmakeRunConfiguration(); ~DesktopQmakeRunConfiguration() override;
virtual bool isEnabled() const; bool isEnabled() const override;
virtual QString disabledReason() const; QString disabledReason() const override;
virtual QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget() override;
virtual QString executable() const; QString executable() const override;
virtual ProjectExplorer::ApplicationLauncher::Mode runMode() const; ProjectExplorer::ApplicationLauncher::Mode runMode() const override;
virtual QString workingDirectory() const; QString workingDirectory() const override;
virtual QString commandLineArguments() const; QString commandLineArguments() const override;
bool isUsingDyldImageSuffix() const; bool isUsingDyldImageSuffix() const;
void setUsingDyldImageSuffix(bool state); void setUsingDyldImageSuffix(bool state);
@@ -88,13 +88,13 @@ public:
Utils::FileName proFilePath() const; 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 setRunMode(ProjectExplorer::ApplicationLauncher::Mode runMode);
void addToBaseEnvironment(Utils::Environment &env) const; void addToBaseEnvironment(Utils::Environment &env) const override;
signals: signals:
void commandLineArgumentsChanged(const QString&); void commandLineArgumentsChanged(const QString&);
void baseWorkingDirectoryChanged(const QString&); void baseWorkingDirectoryChanged(const QString&);
@@ -111,7 +111,7 @@ private slots:
protected: protected:
DesktopQmakeRunConfiguration(ProjectExplorer::Target *parent, DesktopQmakeRunConfiguration *source); DesktopQmakeRunConfiguration(ProjectExplorer::Target *parent, DesktopQmakeRunConfiguration *source);
virtual bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
private: private:
QPair<QString, QString> extractWorkingDirAndExecutable(const QmakeProFileNode *node) const; QPair<QString, QString> extractWorkingDirAndExecutable(const QmakeProFileNode *node) const;

14
src/plugins/qmakeprojectmanager/makestep.h
View File

@@ -80,22 +80,22 @@ class QMAKEPROJECTMANAGER_EXPORT MakeStep : public ProjectExplorer::AbstractProc
public: public:
explicit MakeStep(ProjectExplorer::BuildStepList *bsl); explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
virtual ~MakeStep(); ~MakeStep() override;
QmakeBuildConfiguration *qmakeBuildConfiguration() const; QmakeBuildConfiguration *qmakeBuildConfiguration() const;
virtual bool init(); bool init() override;
virtual void run(QFutureInterface<bool> &); void run(QFutureInterface<bool> &) override;
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
virtual bool immutable() const; bool immutable() const override;
QString userArguments(); QString userArguments();
void setUserArguments(const QString &arguments); void setUserArguments(const QString &arguments);
void setClean(bool clean); void setClean(bool clean);
bool isClean() const; bool isClean() const;
QString makeCommand() const; QString makeCommand() const;
QVariantMap toMap() const; QVariantMap toMap() const override;
signals: signals:
void userArgumentsChanged(); void userArgumentsChanged();
@@ -103,7 +103,7 @@ signals:
protected: protected:
MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs); MakeStep(ProjectExplorer::BuildStepList *bsl, MakeStep *bs);
MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); MakeStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
virtual bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
private: private:
void ctor(); void ctor();

18
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -129,13 +129,13 @@ class QMAKEPROJECTMANAGER_EXPORT QMakeStep : public ProjectExplorer::AbstractPro
public: public:
explicit QMakeStep(ProjectExplorer::BuildStepList *parent); explicit QMakeStep(ProjectExplorer::BuildStepList *parent);
virtual ~QMakeStep(); ~QMakeStep() override;
QmakeBuildConfiguration *qmakeBuildConfiguration() const; QmakeBuildConfiguration *qmakeBuildConfiguration() const;
virtual bool init(); bool init() override;
virtual void run(QFutureInterface<bool> &); void run(QFutureInterface<bool> &) override;
virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
virtual bool immutable() const; bool immutable() const override;
void setForced(bool b); void setForced(bool b);
bool forced(); bool forced();
@@ -155,7 +155,7 @@ public:
bool separateDebugInfo() const; bool separateDebugInfo() const;
void setSeparateDebugInfo(bool enable); void setSeparateDebugInfo(bool enable);
QVariantMap toMap() const; QVariantMap toMap() const override;
signals: signals:
void userArgumentsChanged(); void userArgumentsChanged();
@@ -166,10 +166,10 @@ signals:
protected: protected:
QMakeStep(ProjectExplorer::BuildStepList *parent, QMakeStep *source); QMakeStep(ProjectExplorer::BuildStepList *parent, QMakeStep *source);
QMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id); QMakeStep(ProjectExplorer::BuildStepList *parent, Core::Id id);
virtual bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
virtual void processStartupFailed(); void processStartupFailed() override;
virtual bool processSucceeded(int exitCode, QProcess::ExitStatus status); bool processSucceeded(int exitCode, QProcess::ExitStatus status) override;
private: private:
void ctor(); void ctor();

22
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
View File

@@ -61,11 +61,11 @@ class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplor
public: public:
QmlProjectRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); QmlProjectRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
QString executable() const; QString executable() const override;
ProjectExplorer::ApplicationLauncher::Mode runMode() const; ProjectExplorer::ApplicationLauncher::Mode runMode() const override;
QString commandLineArguments() const; QString commandLineArguments() const override;
QString workingDirectory() const; QString workingDirectory() const override;
QtSupport::BaseQtVersion *qtVersion() const; QtSupport::BaseQtVersion *qtVersion() const;
enum MainScriptSource { enum MainScriptSource {
@@ -79,13 +79,13 @@ public:
QString mainScript() const; QString mainScript() const;
// RunConfiguration // RunConfiguration
bool isEnabled() const; bool isEnabled() const override;
QString disabledReason() const; QString disabledReason() const override;
virtual QWidget *createConfigurationWidget(); virtual QWidget *createConfigurationWidget() override;
Utils::OutputFormatter *createOutputFormatter() const; Utils::OutputFormatter *createOutputFormatter() const override;
QVariantMap toMap() const; QVariantMap toMap() const override;
ProjectExplorer::Abi abi() const; ProjectExplorer::Abi abi() const override;
signals: signals:
void scriptSourceChanged(); void scriptSourceChanged();
@@ -96,7 +96,7 @@ private slots:
protected: protected:
QmlProjectRunConfiguration(ProjectExplorer::Target *parent, QmlProjectRunConfiguration(ProjectExplorer::Target *parent,
QmlProjectRunConfiguration *source); QmlProjectRunConfiguration *source);
virtual bool fromMap(const QVariantMap &map); virtual bool fromMap(const QVariantMap &map) override;
void setEnabled(bool value); void setEnabled(bool value);
private: private:

11
src/plugins/qnx/qnxrunconfiguration.h
View File

@@ -47,19 +47,18 @@ public:
QnxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, 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: protected:
friend class QnxRunConfigurationFactory; friend class QnxRunConfigurationFactory;
QnxRunConfiguration(ProjectExplorer::Target *parent, QnxRunConfiguration(ProjectExplorer::Target *parent, QnxRunConfiguration *source);
QnxRunConfiguration *source);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
private slots: private slots:
void setQtLibPath(const QString &path); void setQtLibPath(const QString &path);

22
src/plugins/qtsupport/customexecutablerunconfiguration.h
View File

@@ -53,29 +53,29 @@ class QTSUPPORT_EXPORT CustomExecutableRunConfiguration : public ProjectExplorer
public: public:
explicit CustomExecutableRunConfiguration(ProjectExplorer::Target *parent); explicit CustomExecutableRunConfiguration(ProjectExplorer::Target *parent);
~CustomExecutableRunConfiguration(); ~CustomExecutableRunConfiguration() override;
/** /**
* Returns the executable, looks in the environment for it and might even * Returns the executable, looks in the environment for it and might even
* ask the user if none is specified * ask the user if none is specified
*/ */
QString executable() const; QString executable() const override;
/** Returns whether this runconfiguration ever was configured with an executable /** Returns whether this runconfiguration ever was configured with an executable
*/ */
bool isConfigured() const; bool isConfigured() const override;
ProjectExplorer::ApplicationLauncher::Mode runMode() const; ProjectExplorer::ApplicationLauncher::Mode runMode() const override;
QString workingDirectory() const; QString workingDirectory() const override;
QString commandLineArguments() const; 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: signals:
void changed(); void changed();
@@ -83,7 +83,7 @@ signals:
protected: protected:
CustomExecutableRunConfiguration(ProjectExplorer::Target *parent, CustomExecutableRunConfiguration(ProjectExplorer::Target *parent,
CustomExecutableRunConfiguration *source); CustomExecutableRunConfiguration *source);
virtual bool fromMap(const QVariantMap &map); virtual bool fromMap(const QVariantMap &map) override;
QString defaultDisplayName() const; QString defaultDisplayName() const;
private slots: private slots:

4
src/plugins/remotelinux/abstractpackagingstep.h
View File

@@ -46,11 +46,11 @@ class REMOTELINUX_EXPORT AbstractPackagingStep : public ProjectExplorer::BuildSt
public: public:
AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, AbstractPackagingStep *other); AbstractPackagingStep(ProjectExplorer::BuildStepList *bsl, AbstractPackagingStep *other);
~AbstractPackagingStep(); ~AbstractPackagingStep() override;
QString packageFilePath() const; QString packageFilePath() const;
QString cachedPackageFilePath() const; QString cachedPackageFilePath() const;
bool init(); bool init() override;
signals: signals:
void packageFilePathChanged(); void packageFilePathChanged();

16
src/plugins/remotelinux/abstractremotelinuxdeploystep.h
View File

@@ -47,14 +47,14 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxDeployStep : public ProjectExplorer:
Q_OBJECT Q_OBJECT
public: public:
~AbstractRemoteLinuxDeployStep(); ~AbstractRemoteLinuxDeployStep() override;
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
bool init(); bool init() override;
void run(QFutureInterface<bool> &fi); void run(QFutureInterface<bool> &fi) override;
bool runInGuiThread() const { return true; } bool runInGuiThread() const override { return true; }
void cancel(); void cancel() override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
RemoteLinuxDeployConfiguration *deployConfiguration() const; RemoteLinuxDeployConfiguration *deployConfiguration() const;
virtual AbstractRemoteLinuxDeployService *deployService() const = 0; virtual AbstractRemoteLinuxDeployService *deployService() const = 0;

2
src/plugins/remotelinux/abstractremotelinuxrunconfiguration.h
View File

@@ -48,7 +48,7 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxRunConfiguration :
public: public:
AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
~AbstractRemoteLinuxRunConfiguration(); ~AbstractRemoteLinuxRunConfiguration() override;
virtual QString localExecutableFilePath() const = 0; virtual QString localExecutableFilePath() const = 0;
virtual QString remoteExecutableFilePath() const = 0; virtual QString remoteExecutableFilePath() const = 0;

12
src/plugins/remotelinux/genericdirectuploadstep.h
View File

@@ -44,10 +44,10 @@ class REMOTELINUX_EXPORT GenericDirectUploadStep : public AbstractRemoteLinuxDep
public: public:
GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, Core::Id id); GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, GenericDirectUploadStep *other); GenericDirectUploadStep(ProjectExplorer::BuildStepList *bsl, GenericDirectUploadStep *other);
~GenericDirectUploadStep(); ~GenericDirectUploadStep() override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool initInternal(QString *error = 0); bool initInternal(QString *error = 0) override;
void setIncrementalDeployment(bool incremental); void setIncrementalDeployment(bool incremental);
bool incrementalDeployment() const; bool incrementalDeployment() const;
@@ -59,9 +59,9 @@ public:
static QString displayName(); static QString displayName();
private: private:
GenericDirectUploadService *deployService() const; GenericDirectUploadService *deployService() const override;
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
void ctor(); void ctor();

12
src/plugins/remotelinux/remotelinuxcheckforfreediskspacestep.h
View File

@@ -43,7 +43,7 @@ public:
Core::Id id = stepId()); Core::Id id = stepId());
RemoteLinuxCheckForFreeDiskSpaceStep(ProjectExplorer::BuildStepList *bsl, RemoteLinuxCheckForFreeDiskSpaceStep(ProjectExplorer::BuildStepList *bsl,
RemoteLinuxCheckForFreeDiskSpaceStep *other); RemoteLinuxCheckForFreeDiskSpaceStep *other);
~RemoteLinuxCheckForFreeDiskSpaceStep(); ~RemoteLinuxCheckForFreeDiskSpaceStep() override;
void setPathToCheck(const QString &path); void setPathToCheck(const QString &path);
QString pathToCheck() const; QString pathToCheck() const;
@@ -55,12 +55,12 @@ public:
static QString stepDisplayName(); static QString stepDisplayName();
protected: protected:
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool initInternal(QString *error); bool initInternal(QString *error) override;
AbstractRemoteLinuxDeployService *deployService() const; AbstractRemoteLinuxDeployService *deployService() const override;
private: private:
void ctor(); void ctor();

18
src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.h
View File

@@ -45,10 +45,10 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxCustomCommandDeploymentStep
{ {
Q_OBJECT Q_OBJECT
public: public:
~AbstractRemoteLinuxCustomCommandDeploymentStep(); ~AbstractRemoteLinuxCustomCommandDeploymentStep() override;
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
void setCommandLine(const QString &commandLine); void setCommandLine(const QString &commandLine);
QString commandLine() const; QString commandLine() const;
@@ -58,13 +58,13 @@ protected:
AbstractRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, AbstractRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl,
AbstractRemoteLinuxCustomCommandDeploymentStep *other); AbstractRemoteLinuxCustomCommandDeploymentStep *other);
bool initInternal(QString *error = 0); bool initInternal(QString *error = 0) override;
private: private:
void ctor(); void ctor();
RemoteLinuxCustomCommandDeployService *deployService() const = 0; RemoteLinuxCustomCommandDeployService *deployService() const override = 0;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
Internal::AbstractRemoteLinuxCustomCommandDeploymentStepPrivate *d; Internal::AbstractRemoteLinuxCustomCommandDeploymentStepPrivate *d;
}; };
@@ -75,16 +75,16 @@ class REMOTELINUX_EXPORT GenericRemoteLinuxCustomCommandDeploymentStep
{ {
Q_OBJECT Q_OBJECT
public: public:
GenericRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl); explicit GenericRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl);
GenericRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl, GenericRemoteLinuxCustomCommandDeploymentStep(ProjectExplorer::BuildStepList *bsl,
GenericRemoteLinuxCustomCommandDeploymentStep *other); GenericRemoteLinuxCustomCommandDeploymentStep *other);
~GenericRemoteLinuxCustomCommandDeploymentStep(); ~GenericRemoteLinuxCustomCommandDeploymentStep() override;
static Core::Id stepId(); static Core::Id stepId();
static QString stepDisplayName(); static QString stepDisplayName();
private: private:
RemoteLinuxCustomCommandDeployService *deployService() const; RemoteLinuxCustomCommandDeployService *deployService() const override;
void ctor(); void ctor();
Internal::GenericRemoteLinuxCustomCommandDeploymentStepPrivate *d; Internal::GenericRemoteLinuxCustomCommandDeploymentStepPrivate *d;

24
src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
View File

@@ -44,20 +44,20 @@ public:
RemoteLinuxCustomRunConfiguration(ProjectExplorer::Target *parent, RemoteLinuxCustomRunConfiguration(ProjectExplorer::Target *parent,
RemoteLinuxCustomRunConfiguration *source); RemoteLinuxCustomRunConfiguration *source);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
bool isEnabled() const { return true; } bool isEnabled() const override { return true; }
bool isConfigured() const; bool isConfigured() const override;
ConfigurationState ensureConfigured(QString *errorMessage); ConfigurationState ensureConfigured(QString *errorMessage) override;
QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget() override;
Utils::OutputFormatter *createOutputFormatter() const; Utils::OutputFormatter *createOutputFormatter() const override;
QString localExecutableFilePath() const { return m_localExecutable; } QString localExecutableFilePath() const override { return m_localExecutable; }
QString remoteExecutableFilePath() const { return m_remoteExecutable; } QString remoteExecutableFilePath() const override { return m_remoteExecutable; }
QStringList arguments() const { return m_arguments; } QStringList arguments() const override { return m_arguments; }
QString workingDirectory() const { return m_workingDirectory; } QString workingDirectory() const override { return m_workingDirectory; }
Utils::Environment environment() const; Utils::Environment environment() const override;
void setLocalExecutableFilePath(const QString &executable) { m_localExecutable = executable; } void setLocalExecutableFilePath(const QString &executable) { m_localExecutable = executable; }
void setRemoteExecutableFilePath(const QString &executable); void setRemoteExecutableFilePath(const QString &executable);

2
src/plugins/remotelinux/remotelinuxdeployconfiguration.h
View File

@@ -50,7 +50,7 @@ public:
RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target, RemoteLinuxDeployConfiguration(ProjectExplorer::Target *target,
RemoteLinuxDeployConfiguration *source); RemoteLinuxDeployConfiguration *source);
ProjectExplorer::NamedWidget *createConfigWidget(); ProjectExplorer::NamedWidget *createConfigWidget() override;
template<class T> T *earlierBuildStep(const ProjectExplorer::BuildStep *laterBuildStep) const template<class T> T *earlierBuildStep(const ProjectExplorer::BuildStep *laterBuildStep) const
{ {

22
src/plugins/remotelinux/remotelinuxrunconfiguration.h
View File

@@ -62,27 +62,27 @@ class REMOTELINUX_EXPORT RemoteLinuxRunConfiguration : public AbstractRemoteLinu
public: public:
RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id,
const QString &targetName); const QString &targetName);
~RemoteLinuxRunConfiguration(); ~RemoteLinuxRunConfiguration() override;
bool isEnabled() const; bool isEnabled() const override;
QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget() override;
Utils::OutputFormatter *createOutputFormatter() const; 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 defaultRemoteExecutableFilePath() const;
QString remoteExecutableFilePath() const; QString remoteExecutableFilePath() const override;
QStringList arguments() const; QStringList arguments() const override;
void setArguments(const QString &args); void setArguments(const QString &args);
QString workingDirectory() const; QString workingDirectory() const override;
void setWorkingDirectory(const QString &wd); void setWorkingDirectory(const QString &wd);
void setAlternateRemoteExecutable(const QString &exe); void setAlternateRemoteExecutable(const QString &exe);
QString alternateRemoteExecutable() const; QString alternateRemoteExecutable() const;
void setUseAlternateExecutable(bool useAlternate); void setUseAlternateExecutable(bool useAlternate);
bool useAlternateExecutable() const; bool useAlternateExecutable() const;
QVariantMap toMap() const; QVariantMap toMap() const override;
static const char *IdPrefix; static const char *IdPrefix;
@@ -93,7 +93,7 @@ signals:
protected: protected:
RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent,
RemoteLinuxRunConfiguration *source); RemoteLinuxRunConfiguration *source);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QString defaultDisplayName(); QString defaultDisplayName();
protected slots: protected slots:

12
src/plugins/remotelinux/tarpackagecreationstep.h
View File

@@ -52,18 +52,18 @@ public:
static Core::Id stepId(); static Core::Id stepId();
static QString displayName(); static QString displayName();
bool init(); bool init() override;
void run(QFutureInterface<bool> &fi); void run(QFutureInterface<bool> &fi) override;
void setIgnoreMissingFiles(bool ignoreMissingFiles); void setIgnoreMissingFiles(bool ignoreMissingFiles);
bool ignoreMissingFiles() const; bool ignoreMissingFiles() const;
private: private:
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
QString packageFileName() const; QString packageFileName() const override;
void ctor(); void ctor();
bool doPackage(QFutureInterface<bool> &fi); bool doPackage(QFutureInterface<bool> &fi);

6
src/plugins/remotelinux/uploadandinstalltarpackagestep.h
View File

@@ -62,15 +62,15 @@ public:
UploadAndInstallTarPackageStep(ProjectExplorer::BuildStepList *bsl, UploadAndInstallTarPackageStep(ProjectExplorer::BuildStepList *bsl,
UploadAndInstallTarPackageStep *other); 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 Core::Id stepId();
static QString displayName(); static QString displayName();
private: private:
AbstractRemoteLinuxDeployService *deployService() const { return m_deployService; } AbstractRemoteLinuxDeployService *deployService() const override { return m_deployService; }
void ctor(); void ctor();

14
src/plugins/winrt/winrtpackagedeploymentstep.h
View File

@@ -41,11 +41,11 @@ class WinRtPackageDeploymentStep : public ProjectExplorer::AbstractProcessStep
Q_OBJECT Q_OBJECT
public: public:
explicit WinRtPackageDeploymentStep(ProjectExplorer::BuildStepList *bsl); explicit WinRtPackageDeploymentStep(ProjectExplorer::BuildStepList *bsl);
bool init(); bool init() override;
void run(QFutureInterface<bool> &fi); void run(QFutureInterface<bool> &fi) override;
bool processSucceeded(int exitCode, QProcess::ExitStatus status); bool processSucceeded(int exitCode, QProcess::ExitStatus status) override;
void stdOutput(const QString &line); void stdOutput(const QString &line) override;
ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); ProjectExplorer::BuildStepConfigWidget *createConfigWidget() override;
void setWinDeployQtArguments(const QString &args); void setWinDeployQtArguments(const QString &args);
QString winDeployQtArguments() const; QString winDeployQtArguments() const;
@@ -54,8 +54,8 @@ public:
void raiseError(const QString &errorMessage); void raiseError(const QString &errorMessage);
void raiseWarning(const QString &warningMessage); void raiseWarning(const QString &warningMessage);
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const; QVariantMap toMap() const override;
private: private:
bool parseIconsAndExecutableFromManifest(QString manifestFileName, QStringList *items, QString *executable); bool parseIconsAndExecutableFromManifest(QString manifestFileName, QStringList *items, QString *executable);

8
src/plugins/winrt/winrtrunconfiguration.h
View File

@@ -43,10 +43,10 @@ class WinRtRunConfiguration : public ProjectExplorer::RunConfiguration
public: public:
explicit WinRtRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); explicit WinRtRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
QWidget *createConfigurationWidget(); QWidget *createConfigurationWidget() override;
bool isEnabled() const { return true; } // Always enabled like DLL run control bool isEnabled() const override { return true; } // Always enabled like DLL run control
QVariantMap toMap() const; QVariantMap toMap() const override;
bool fromMap(const QVariantMap &map); bool fromMap(const QVariantMap &map) override;
const QString &proFilePath() const { return m_proFilePath; } const QString &proFilePath() const { return m_proFilePath; }
const QString &arguments() const { return m_arguments; } const QString &arguments() const { return m_arguments; }