forked from qt-creator/qt-creator
Remove unnecessary destructors
Change-Id: Id0bc2d3a305e6af24838266195ab22e04e3a12a1 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
@@ -84,10 +84,6 @@ void BareMetalGdbCommandsDeployStep::ctor()
|
|||||||
setDefaultDisplayName(displayName());
|
setDefaultDisplayName(displayName());
|
||||||
}
|
}
|
||||||
|
|
||||||
BareMetalGdbCommandsDeployStep::~BareMetalGdbCommandsDeployStep()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void BareMetalGdbCommandsDeployStep::run(QFutureInterface<bool> &fi)
|
void BareMetalGdbCommandsDeployStep::run(QFutureInterface<bool> &fi)
|
||||||
{
|
{
|
||||||
fi.reportResult(true);
|
fi.reportResult(true);
|
||||||
|
|||||||
@@ -47,7 +47,6 @@ 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() override;
|
|
||||||
|
|
||||||
bool init() override;
|
bool init() override;
|
||||||
void run(QFutureInterface<bool> &fi) override;
|
void run(QFutureInterface<bool> &fi) override;
|
||||||
|
|||||||
@@ -92,10 +92,6 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *parent, CMakeRunConfigurati
|
|||||||
ctor();
|
ctor();
|
||||||
}
|
}
|
||||||
|
|
||||||
CMakeRunConfiguration::~CMakeRunConfiguration()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void CMakeRunConfiguration::ctor()
|
void CMakeRunConfiguration::ctor()
|
||||||
{
|
{
|
||||||
setDefaultDisplayName(defaultDisplayName());
|
setDefaultDisplayName(defaultDisplayName());
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ 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() override;
|
|
||||||
|
|
||||||
QString executable() const override;
|
QString executable() const override;
|
||||||
ProjectExplorer::ApplicationLauncher::Mode runMode() const override;
|
ProjectExplorer::ApplicationLauncher::Mode runMode() const override;
|
||||||
|
|||||||
@@ -115,10 +115,6 @@ void MakeStep::ctor()
|
|||||||
this, &MakeStep::buildTargetsChanged);
|
this, &MakeStep::buildTargetsChanged);
|
||||||
}
|
}
|
||||||
|
|
||||||
MakeStep::~MakeStep()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
CMakeBuildConfiguration *MakeStep::cmakeBuildConfiguration() const
|
CMakeBuildConfiguration *MakeStep::cmakeBuildConfiguration() const
|
||||||
{
|
{
|
||||||
return static_cast<CMakeBuildConfiguration *>(buildConfiguration());
|
return static_cast<CMakeBuildConfiguration *>(buildConfiguration());
|
||||||
|
|||||||
@@ -56,7 +56,6 @@ class MakeStep : public ProjectExplorer::AbstractProcessStep
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
|
explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
|
||||||
~MakeStep() override;
|
|
||||||
|
|
||||||
CMakeBuildConfiguration *cmakeBuildConfiguration() const;
|
CMakeBuildConfiguration *cmakeBuildConfiguration() const;
|
||||||
|
|
||||||
|
|||||||
@@ -94,10 +94,6 @@ void GenericMakeStep::ctor()
|
|||||||
GENERIC_MS_DISPLAY_NAME));
|
GENERIC_MS_DISPLAY_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
GenericMakeStep::~GenericMakeStep()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool GenericMakeStep::init()
|
bool GenericMakeStep::init()
|
||||||
{
|
{
|
||||||
BuildConfiguration *bc = buildConfiguration();
|
BuildConfiguration *bc = buildConfiguration();
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ class GenericMakeStep : public ProjectExplorer::AbstractProcessStep
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit GenericMakeStep(ProjectExplorer::BuildStepList *parent);
|
explicit GenericMakeStep(ProjectExplorer::BuildStepList *parent);
|
||||||
~GenericMakeStep() override;
|
|
||||||
|
|
||||||
bool init() override;
|
bool init() override;
|
||||||
void run(QFutureInterface<bool> &fi) override;
|
void run(QFutureInterface<bool> &fi) override;
|
||||||
|
|||||||
@@ -95,10 +95,6 @@ void IosBuildStep::ctor()
|
|||||||
IOS_BUILD_STEP_DISPLAY_NAME));
|
IOS_BUILD_STEP_DISPLAY_NAME));
|
||||||
}
|
}
|
||||||
|
|
||||||
IosBuildStep::~IosBuildStep()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IosBuildStep::init()
|
bool IosBuildStep::init()
|
||||||
{
|
{
|
||||||
BuildConfiguration *bc = buildConfiguration();
|
BuildConfiguration *bc = buildConfiguration();
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit IosBuildStep(ProjectExplorer::BuildStepList *parent);
|
explicit IosBuildStep(ProjectExplorer::BuildStepList *parent);
|
||||||
~IosBuildStep() override;
|
|
||||||
|
|
||||||
bool init() override;
|
bool init() override;
|
||||||
void run(QFutureInterface<bool> &fi) override;
|
void run(QFutureInterface<bool> &fi) override;
|
||||||
|
|||||||
@@ -76,8 +76,6 @@ IosDeployStep::IosDeployStep(BuildStepList *parent,
|
|||||||
ctor();
|
ctor();
|
||||||
}
|
}
|
||||||
|
|
||||||
IosDeployStep::~IosDeployStep() { }
|
|
||||||
|
|
||||||
void IosDeployStep::ctor()
|
void IosDeployStep::ctor()
|
||||||
{
|
{
|
||||||
m_toolHandler = 0;
|
m_toolHandler = 0;
|
||||||
|
|||||||
@@ -66,8 +66,6 @@ public:
|
|||||||
friend class IosDeployStepFactory;
|
friend class IosDeployStepFactory;
|
||||||
explicit IosDeployStep(ProjectExplorer::BuildStepList *bc);
|
explicit IosDeployStep(ProjectExplorer::BuildStepList *bc);
|
||||||
|
|
||||||
~IosDeployStep() override;
|
|
||||||
|
|
||||||
bool fromMap(const QVariantMap &map) override;
|
bool fromMap(const QVariantMap &map) override;
|
||||||
QVariantMap toMap() const override;
|
QVariantMap toMap() const override;
|
||||||
|
|
||||||
|
|||||||
@@ -84,10 +84,6 @@ bool IosPresetBuildStep::completeSetupWithStep(BuildStep *bs)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
IosPresetBuildStep::~IosPresetBuildStep()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool IosPresetBuildStep::init()
|
bool IosPresetBuildStep::init()
|
||||||
{
|
{
|
||||||
BuildConfiguration *bc = buildConfiguration();
|
BuildConfiguration *bc = buildConfiguration();
|
||||||
|
|||||||
@@ -47,8 +47,6 @@ class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep
|
|||||||
friend class IosPresetBuildStepFactory;
|
friend class IosPresetBuildStepFactory;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
~IosPresetBuildStep() override;
|
|
||||||
|
|
||||||
bool init() override;
|
bool init() override;
|
||||||
void run(QFutureInterface<bool> &fi) override;
|
void run(QFutureInterface<bool> &fi) override;
|
||||||
|
|
||||||
|
|||||||
@@ -113,10 +113,6 @@ void BuildConfiguration::ctor()
|
|||||||
[this] { return displayName(); }, false);
|
[this] { return displayName(); }, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
BuildConfiguration::~BuildConfiguration()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
Utils::FileName BuildConfiguration::buildDirectory() const
|
Utils::FileName BuildConfiguration::buildDirectory() const
|
||||||
{
|
{
|
||||||
QString path = QDir::cleanPath(environment().expandVariables(m_buildDirectory.toString()));
|
QString path = QDir::cleanPath(environment().expandVariables(m_buildDirectory.toString()));
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
// ctors are protected
|
// ctors are protected
|
||||||
~BuildConfiguration() override;
|
|
||||||
|
|
||||||
Utils::FileName buildDirectory() const;
|
Utils::FileName buildDirectory() const;
|
||||||
Utils::FileName rawBuildDirectory() const;
|
Utils::FileName rawBuildDirectory() const;
|
||||||
|
|||||||
@@ -127,10 +127,6 @@ BuildStep::BuildStep(BuildStepList *bsl, BuildStep *bs) :
|
|||||||
setDisplayName(bs->displayName());
|
setDisplayName(bs->displayName());
|
||||||
}
|
}
|
||||||
|
|
||||||
BuildStep::~BuildStep()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool BuildStep::fromMap(const QVariantMap &map)
|
bool BuildStep::fromMap(const QVariantMap &map)
|
||||||
{
|
{
|
||||||
m_enabled = map.value(QLatin1String(buildStepEnabledKey), true).toBool();
|
m_enabled = map.value(QLatin1String(buildStepEnabledKey), true).toBool();
|
||||||
|
|||||||
@@ -56,8 +56,6 @@ protected:
|
|||||||
BuildStep(BuildStepList *bsl, BuildStep *bs);
|
BuildStep(BuildStepList *bsl, BuildStep *bs);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
~BuildStep() override;
|
|
||||||
|
|
||||||
virtual bool init() = 0;
|
virtual bool init() = 0;
|
||||||
|
|
||||||
virtual void run(QFutureInterface<bool> &fi) = 0;
|
virtual void run(QFutureInterface<bool> &fi) = 0;
|
||||||
|
|||||||
@@ -51,10 +51,6 @@ LocalApplicationRunConfiguration::LocalApplicationRunConfiguration(Target *targe
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
LocalApplicationRunConfiguration::~LocalApplicationRunConfiguration()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void LocalApplicationRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
|
void LocalApplicationRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
|
||||||
{
|
{
|
||||||
Q_UNUSED(env);
|
Q_UNUSED(env);
|
||||||
|
|||||||
@@ -42,8 +42,6 @@ class PROJECTEXPLORER_EXPORT LocalApplicationRunConfiguration : public RunConfig
|
|||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
~LocalApplicationRunConfiguration() override;
|
|
||||||
|
|
||||||
virtual QString executable() const = 0;
|
virtual QString executable() const = 0;
|
||||||
virtual ApplicationLauncher::Mode runMode() const = 0;
|
virtual ApplicationLauncher::Mode runMode() const = 0;
|
||||||
virtual QString workingDirectory() const = 0;
|
virtual QString workingDirectory() const = 0;
|
||||||
|
|||||||
@@ -72,10 +72,6 @@ void ProcessStep::ctor()
|
|||||||
m_workingDirectory = QLatin1String(Constants::DEFAULT_WORKING_DIR);
|
m_workingDirectory = QLatin1String(Constants::DEFAULT_WORKING_DIR);
|
||||||
}
|
}
|
||||||
|
|
||||||
ProcessStep::~ProcessStep()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool ProcessStep::init()
|
bool ProcessStep::init()
|
||||||
{
|
{
|
||||||
BuildConfiguration *bc = buildConfiguration();
|
BuildConfiguration *bc = buildConfiguration();
|
||||||
|
|||||||
@@ -64,7 +64,6 @@ class ProcessStep : public AbstractProcessStep
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit ProcessStep(BuildStepList *bsl);
|
explicit ProcessStep(BuildStepList *bsl);
|
||||||
~ProcessStep() override;
|
|
||||||
|
|
||||||
bool init() override;
|
bool init() override;
|
||||||
void run(QFutureInterface<bool> &) override;
|
void run(QFutureInterface<bool> &) override;
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public:
|
|||||||
void run(QFutureInterface<bool> &fi) override;
|
void run(QFutureInterface<bool> &fi) override;
|
||||||
private:
|
private:
|
||||||
AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bc,
|
AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bc,
|
||||||
AndroidPackageInstallationStep *other);
|
AndroidPackageInstallationStep *other);
|
||||||
QStringList m_androidDirsToClean;
|
QStringList m_androidDirsToClean;
|
||||||
static const Core::Id Id;
|
static const Core::Id Id;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -71,8 +71,7 @@ public:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
friend class QmakeAndroidBuildApkStepFactory;
|
friend class QmakeAndroidBuildApkStepFactory;
|
||||||
QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepList *bc,
|
QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, QmakeAndroidBuildApkStep *other);
|
||||||
QmakeAndroidBuildApkStep *other);
|
|
||||||
|
|
||||||
Utils::FileName androidPackageSourceDir() const override;
|
Utils::FileName androidPackageSourceDir() const override;
|
||||||
|
|
||||||
|
|||||||
@@ -110,10 +110,6 @@ DesktopQmakeRunConfiguration::DesktopQmakeRunConfiguration(Target *parent, Deskt
|
|||||||
ctor();
|
ctor();
|
||||||
}
|
}
|
||||||
|
|
||||||
DesktopQmakeRunConfiguration::~DesktopQmakeRunConfiguration()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
bool DesktopQmakeRunConfiguration::isEnabled() const
|
bool DesktopQmakeRunConfiguration::isEnabled() const
|
||||||
{
|
{
|
||||||
return m_parseSuccess && !m_parseInProgress;
|
return m_parseSuccess && !m_parseInProgress;
|
||||||
|
|||||||
@@ -69,7 +69,6 @@ class DesktopQmakeRunConfiguration : public ProjectExplorer::LocalApplicationRun
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
DesktopQmakeRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
|
DesktopQmakeRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
|
||||||
~DesktopQmakeRunConfiguration() override;
|
|
||||||
|
|
||||||
bool isEnabled() const override;
|
bool isEnabled() const override;
|
||||||
QString disabledReason() const override;
|
QString disabledReason() const override;
|
||||||
|
|||||||
@@ -93,10 +93,6 @@ void MakeStep::setMakeCommand(const QString &make)
|
|||||||
m_makeCmd = make;
|
m_makeCmd = make;
|
||||||
}
|
}
|
||||||
|
|
||||||
MakeStep::~MakeStep()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
QmakeBuildConfiguration *MakeStep::qmakeBuildConfiguration() const
|
QmakeBuildConfiguration *MakeStep::qmakeBuildConfiguration() const
|
||||||
{
|
{
|
||||||
return static_cast<QmakeBuildConfiguration *>(buildConfiguration());
|
return static_cast<QmakeBuildConfiguration *>(buildConfiguration());
|
||||||
|
|||||||
@@ -80,7 +80,6 @@ class QMAKEPROJECTMANAGER_EXPORT MakeStep : public ProjectExplorer::AbstractProc
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
|
explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
|
||||||
~MakeStep() override;
|
|
||||||
|
|
||||||
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
|
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
|
||||||
|
|
||||||
|
|||||||
@@ -105,10 +105,6 @@ void QMakeStep::ctor()
|
|||||||
setDefaultDisplayName(tr("qmake"));
|
setDefaultDisplayName(tr("qmake"));
|
||||||
}
|
}
|
||||||
|
|
||||||
QMakeStep::~QMakeStep()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
QmakeBuildConfiguration *QMakeStep::qmakeBuildConfiguration() const
|
QmakeBuildConfiguration *QMakeStep::qmakeBuildConfiguration() const
|
||||||
{
|
{
|
||||||
return static_cast<QmakeBuildConfiguration *>(buildConfiguration());
|
return static_cast<QmakeBuildConfiguration *>(buildConfiguration());
|
||||||
|
|||||||
@@ -129,7 +129,6 @@ class QMAKEPROJECTMANAGER_EXPORT QMakeStep : public ProjectExplorer::AbstractPro
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
explicit QMakeStep(ProjectExplorer::BuildStepList *parent);
|
explicit QMakeStep(ProjectExplorer::BuildStepList *parent);
|
||||||
~QMakeStep() override;
|
|
||||||
|
|
||||||
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
|
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
|
||||||
bool init() override;
|
bool init() override;
|
||||||
|
|||||||
@@ -39,11 +39,6 @@ AbstractRemoteLinuxRunConfiguration::AbstractRemoteLinuxRunConfiguration(Project
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
AbstractRemoteLinuxRunConfiguration::~AbstractRemoteLinuxRunConfiguration()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
AbstractRemoteLinuxRunConfiguration::AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent,
|
AbstractRemoteLinuxRunConfiguration::AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent,
|
||||||
AbstractRemoteLinuxRunConfiguration *source): RunConfiguration(parent, source)
|
AbstractRemoteLinuxRunConfiguration *source): RunConfiguration(parent, source)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -48,8 +48,6 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxRunConfiguration :
|
|||||||
public:
|
public:
|
||||||
AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
|
AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
|
||||||
|
|
||||||
~AbstractRemoteLinuxRunConfiguration() override;
|
|
||||||
|
|
||||||
virtual QString localExecutableFilePath() const = 0;
|
virtual QString localExecutableFilePath() const = 0;
|
||||||
virtual QString remoteExecutableFilePath() const = 0;
|
virtual QString remoteExecutableFilePath() const = 0;
|
||||||
virtual QStringList arguments() const = 0;
|
virtual QStringList arguments() const = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user