From a110abeed7a5588b52cb63aa48c62b197b88fdcf Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Fri, 13 Nov 2015 11:44:00 +0100
Subject: [PATCH] Remove unnecessary destructors
Change-Id: Id0bc2d3a305e6af24838266195ab22e04e3a12a1
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
---
src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp | 4 ----
src/plugins/baremetal/baremetalgdbcommandsdeploystep.h | 1 -
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp | 4 ----
src/plugins/cmakeprojectmanager/cmakerunconfiguration.h | 1 -
src/plugins/cmakeprojectmanager/makestep.cpp | 4 ----
src/plugins/cmakeprojectmanager/makestep.h | 1 -
src/plugins/genericprojectmanager/genericmakestep.cpp | 4 ----
src/plugins/genericprojectmanager/genericmakestep.h | 1 -
src/plugins/ios/iosbuildstep.cpp | 4 ----
src/plugins/ios/iosbuildstep.h | 1 -
src/plugins/ios/iosdeploystep.cpp | 2 --
src/plugins/ios/iosdeploystep.h | 2 --
src/plugins/ios/iosdsymbuildstep.cpp | 4 ----
src/plugins/ios/iosdsymbuildstep.h | 2 --
src/plugins/projectexplorer/buildconfiguration.cpp | 4 ----
src/plugins/projectexplorer/buildconfiguration.h | 1 -
src/plugins/projectexplorer/buildstep.cpp | 4 ----
src/plugins/projectexplorer/buildstep.h | 2 --
.../projectexplorer/localapplicationrunconfiguration.cpp | 4 ----
.../projectexplorer/localapplicationrunconfiguration.h | 2 --
src/plugins/projectexplorer/processstep.cpp | 4 ----
src/plugins/projectexplorer/processstep.h | 1 -
.../qmakeandroidsupport/androidpackageinstallationstep.h | 2 +-
src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h | 3 +--
.../qmakeprojectmanager/desktopqmakerunconfiguration.cpp | 4 ----
.../qmakeprojectmanager/desktopqmakerunconfiguration.h | 1 -
src/plugins/qmakeprojectmanager/makestep.cpp | 4 ----
src/plugins/qmakeprojectmanager/makestep.h | 1 -
src/plugins/qmakeprojectmanager/qmakestep.cpp | 4 ----
src/plugins/qmakeprojectmanager/qmakestep.h | 1 -
.../remotelinux/abstractremotelinuxrunconfiguration.cpp | 5 -----
.../remotelinux/abstractremotelinuxrunconfiguration.h | 2 --
32 files changed, 2 insertions(+), 82 deletions(-)
diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp
index cdf1252b398..cbd895fd910 100644
--- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp
+++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp
@@ -84,10 +84,6 @@ void BareMetalGdbCommandsDeployStep::ctor()
setDefaultDisplayName(displayName());
}
-BareMetalGdbCommandsDeployStep::~BareMetalGdbCommandsDeployStep()
-{
-}
-
void BareMetalGdbCommandsDeployStep::run(QFutureInterface<bool> &fi)
{
fi.reportResult(true);
diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h
index dfbe47997b6..2eb6cfc6f03 100644
--- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h
+++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.h
@@ -47,7 +47,6 @@ public:
BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl, Core::Id id);
BareMetalGdbCommandsDeployStep(ProjectExplorer::BuildStepList *bsl,
BareMetalGdbCommandsDeployStep *other);
- ~BareMetalGdbCommandsDeployStep() override;
bool init() override;
void run(QFutureInterface<bool> &fi) override;
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index 66970f65f71..c0df82f2b79 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -92,10 +92,6 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *parent, CMakeRunConfigurati
ctor();
}
-CMakeRunConfiguration::~CMakeRunConfiguration()
-{
-}
-
void CMakeRunConfiguration::ctor()
{
setDefaultDisplayName(defaultDisplayName());
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
index b6ecbc6d4ec..1f93196cf62 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.h
@@ -57,7 +57,6 @@ class CMakeRunConfiguration : public ProjectExplorer::LocalApplicationRunConfigu
public:
CMakeRunConfiguration(ProjectExplorer::Target *parent, Core::Id id, const QString &target,
const QString &workingDirectory, const QString &title);
- ~CMakeRunConfiguration() override;
QString executable() const override;
ProjectExplorer::ApplicationLauncher::Mode runMode() const override;
diff --git a/src/plugins/cmakeprojectmanager/makestep.cpp b/src/plugins/cmakeprojectmanager/makestep.cpp
index 821f3ad9083..81966594960 100644
--- a/src/plugins/cmakeprojectmanager/makestep.cpp
+++ b/src/plugins/cmakeprojectmanager/makestep.cpp
@@ -115,10 +115,6 @@ void MakeStep::ctor()
this, &MakeStep::buildTargetsChanged);
}
-MakeStep::~MakeStep()
-{
-}
-
CMakeBuildConfiguration *MakeStep::cmakeBuildConfiguration() const
{
return static_cast<CMakeBuildConfiguration *>(buildConfiguration());
diff --git a/src/plugins/cmakeprojectmanager/makestep.h b/src/plugins/cmakeprojectmanager/makestep.h
index 8b472441eac..06efaecb1d3 100644
--- a/src/plugins/cmakeprojectmanager/makestep.h
+++ b/src/plugins/cmakeprojectmanager/makestep.h
@@ -56,7 +56,6 @@ class MakeStep : public ProjectExplorer::AbstractProcessStep
public:
explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
- ~MakeStep() override;
CMakeBuildConfiguration *cmakeBuildConfiguration() const;
diff --git a/src/plugins/genericprojectmanager/genericmakestep.cpp b/src/plugins/genericprojectmanager/genericmakestep.cpp
index 1235c8ed0b6..a96a9face88 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.cpp
+++ b/src/plugins/genericprojectmanager/genericmakestep.cpp
@@ -94,10 +94,6 @@ void GenericMakeStep::ctor()
GENERIC_MS_DISPLAY_NAME));
}
-GenericMakeStep::~GenericMakeStep()
-{
-}
-
bool GenericMakeStep::init()
{
BuildConfiguration *bc = buildConfiguration();
diff --git a/src/plugins/genericprojectmanager/genericmakestep.h b/src/plugins/genericprojectmanager/genericmakestep.h
index 91b79393e0c..e3912a625cf 100644
--- a/src/plugins/genericprojectmanager/genericmakestep.h
+++ b/src/plugins/genericprojectmanager/genericmakestep.h
@@ -53,7 +53,6 @@ class GenericMakeStep : public ProjectExplorer::AbstractProcessStep
public:
explicit GenericMakeStep(ProjectExplorer::BuildStepList *parent);
- ~GenericMakeStep() override;
bool init() override;
void run(QFutureInterface<bool> &fi) override;
diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp
index 3662ad1d301..388d1345870 100644
--- a/src/plugins/ios/iosbuildstep.cpp
+++ b/src/plugins/ios/iosbuildstep.cpp
@@ -95,10 +95,6 @@ void IosBuildStep::ctor()
IOS_BUILD_STEP_DISPLAY_NAME));
}
-IosBuildStep::~IosBuildStep()
-{
-}
-
bool IosBuildStep::init()
{
BuildConfiguration *bc = buildConfiguration();
diff --git a/src/plugins/ios/iosbuildstep.h b/src/plugins/ios/iosbuildstep.h
index 08f7d5609da..9a12c7525dd 100644
--- a/src/plugins/ios/iosbuildstep.h
+++ b/src/plugins/ios/iosbuildstep.h
@@ -52,7 +52,6 @@ class IosBuildStep : public ProjectExplorer::AbstractProcessStep
public:
explicit IosBuildStep(ProjectExplorer::BuildStepList *parent);
- ~IosBuildStep() override;
bool init() override;
void run(QFutureInterface<bool> &fi) override;
diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp
index 2ccb2294343..3ac913091bf 100644
--- a/src/plugins/ios/iosdeploystep.cpp
+++ b/src/plugins/ios/iosdeploystep.cpp
@@ -76,8 +76,6 @@ IosDeployStep::IosDeployStep(BuildStepList *parent,
ctor();
}
-IosDeployStep::~IosDeployStep() { }
-
void IosDeployStep::ctor()
{
m_toolHandler = 0;
diff --git a/src/plugins/ios/iosdeploystep.h b/src/plugins/ios/iosdeploystep.h
index 2e5d8773d4e..a229fc48be3 100644
--- a/src/plugins/ios/iosdeploystep.h
+++ b/src/plugins/ios/iosdeploystep.h
@@ -66,8 +66,6 @@ public:
friend class IosDeployStepFactory;
explicit IosDeployStep(ProjectExplorer::BuildStepList *bc);
- ~IosDeployStep() override;
-
bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override;
diff --git a/src/plugins/ios/iosdsymbuildstep.cpp b/src/plugins/ios/iosdsymbuildstep.cpp
index 2b08097d9b6..d6088e30ad1 100644
--- a/src/plugins/ios/iosdsymbuildstep.cpp
+++ b/src/plugins/ios/iosdsymbuildstep.cpp
@@ -84,10 +84,6 @@ bool IosPresetBuildStep::completeSetupWithStep(BuildStep *bs)
return true;
}
-IosPresetBuildStep::~IosPresetBuildStep()
-{
-}
-
bool IosPresetBuildStep::init()
{
BuildConfiguration *bc = buildConfiguration();
diff --git a/src/plugins/ios/iosdsymbuildstep.h b/src/plugins/ios/iosdsymbuildstep.h
index ff5b3109d86..b41cfd836aa 100644
--- a/src/plugins/ios/iosdsymbuildstep.h
+++ b/src/plugins/ios/iosdsymbuildstep.h
@@ -47,8 +47,6 @@ class IosPresetBuildStep : public ProjectExplorer::AbstractProcessStep
friend class IosPresetBuildStepFactory;
public:
- ~IosPresetBuildStep() override;
-
bool init() override;
void run(QFutureInterface<bool> &fi) override;
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 25c56725ba8..d77da18af85 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -113,10 +113,6 @@ void BuildConfiguration::ctor()
[this] { return displayName(); }, false);
}
-BuildConfiguration::~BuildConfiguration()
-{
-}
-
Utils::FileName BuildConfiguration::buildDirectory() const
{
QString path = QDir::cleanPath(environment().expandVariables(m_buildDirectory.toString()));
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 731a99a50d7..da6e5764ad7 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -53,7 +53,6 @@ class PROJECTEXPLORER_EXPORT BuildConfiguration : public ProjectConfiguration
public:
// ctors are protected
- ~BuildConfiguration() override;
Utils::FileName buildDirectory() const;
Utils::FileName rawBuildDirectory() const;
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 1d4e40b0aa3..719dad45a9f 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -127,10 +127,6 @@ BuildStep::BuildStep(BuildStepList *bsl, BuildStep *bs) :
setDisplayName(bs->displayName());
}
-BuildStep::~BuildStep()
-{
-}
-
bool BuildStep::fromMap(const QVariantMap &map)
{
m_enabled = map.value(QLatin1String(buildStepEnabledKey), true).toBool();
diff --git a/src/plugins/projectexplorer/buildstep.h b/src/plugins/projectexplorer/buildstep.h
index e550fbd6bf2..43ae9aef02b 100644
--- a/src/plugins/projectexplorer/buildstep.h
+++ b/src/plugins/projectexplorer/buildstep.h
@@ -56,8 +56,6 @@ protected:
BuildStep(BuildStepList *bsl, BuildStep *bs);
public:
- ~BuildStep() override;
-
virtual bool init() = 0;
virtual void run(QFutureInterface<bool> &fi) = 0;
diff --git a/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp b/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp
index ff3ace96873..c10a6f09e70 100644
--- a/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp
+++ b/src/plugins/projectexplorer/localapplicationrunconfiguration.cpp
@@ -51,10 +51,6 @@ LocalApplicationRunConfiguration::LocalApplicationRunConfiguration(Target *targe
{
}
-LocalApplicationRunConfiguration::~LocalApplicationRunConfiguration()
-{
-}
-
void LocalApplicationRunConfiguration::addToBaseEnvironment(Utils::Environment &env) const
{
Q_UNUSED(env);
diff --git a/src/plugins/projectexplorer/localapplicationrunconfiguration.h b/src/plugins/projectexplorer/localapplicationrunconfiguration.h
index 9c0653e7cbd..51777c775b5 100644
--- a/src/plugins/projectexplorer/localapplicationrunconfiguration.h
+++ b/src/plugins/projectexplorer/localapplicationrunconfiguration.h
@@ -42,8 +42,6 @@ class PROJECTEXPLORER_EXPORT LocalApplicationRunConfiguration : public RunConfig
{
Q_OBJECT
public:
- ~LocalApplicationRunConfiguration() override;
-
virtual QString executable() const = 0;
virtual ApplicationLauncher::Mode runMode() const = 0;
virtual QString workingDirectory() const = 0;
diff --git a/src/plugins/projectexplorer/processstep.cpp b/src/plugins/projectexplorer/processstep.cpp
index 2e9cf17bf73..8d20363c7c6 100644
--- a/src/plugins/projectexplorer/processstep.cpp
+++ b/src/plugins/projectexplorer/processstep.cpp
@@ -72,10 +72,6 @@ void ProcessStep::ctor()
m_workingDirectory = QLatin1String(Constants::DEFAULT_WORKING_DIR);
}
-ProcessStep::~ProcessStep()
-{
-}
-
bool ProcessStep::init()
{
BuildConfiguration *bc = buildConfiguration();
diff --git a/src/plugins/projectexplorer/processstep.h b/src/plugins/projectexplorer/processstep.h
index ca3911f97f4..9360fa921f5 100644
--- a/src/plugins/projectexplorer/processstep.h
+++ b/src/plugins/projectexplorer/processstep.h
@@ -64,7 +64,6 @@ class ProcessStep : public AbstractProcessStep
public:
explicit ProcessStep(BuildStepList *bsl);
- ~ProcessStep() override;
bool init() override;
void run(QFutureInterface<bool> &) override;
diff --git a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h
index f0eebd40432..b1157666ea3 100644
--- a/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h
+++ b/src/plugins/qmakeandroidsupport/androidpackageinstallationstep.h
@@ -52,7 +52,7 @@ public:
void run(QFutureInterface<bool> &fi) override;
private:
AndroidPackageInstallationStep(ProjectExplorer::BuildStepList *bc,
- AndroidPackageInstallationStep *other);
+ AndroidPackageInstallationStep *other);
QStringList m_androidDirsToClean;
static const Core::Id Id;
};
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
index 7d8ccb1381b..b3e3115646f 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.h
@@ -71,8 +71,7 @@ public:
protected:
friend class QmakeAndroidBuildApkStepFactory;
- QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepList *bc,
- QmakeAndroidBuildApkStep *other);
+ QmakeAndroidBuildApkStep(ProjectExplorer::BuildStepList *bc, QmakeAndroidBuildApkStep *other);
Utils::FileName androidPackageSourceDir() const override;
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
index a7194962bbe..774f0b51cb7 100644
--- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
@@ -110,10 +110,6 @@ DesktopQmakeRunConfiguration::DesktopQmakeRunConfiguration(Target *parent, Deskt
ctor();
}
-DesktopQmakeRunConfiguration::~DesktopQmakeRunConfiguration()
-{
-}
-
bool DesktopQmakeRunConfiguration::isEnabled() const
{
return m_parseSuccess && !m_parseInProgress;
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
index 88f5542e414..658b3d30ba8 100644
--- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
+++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.h
@@ -69,7 +69,6 @@ class DesktopQmakeRunConfiguration : public ProjectExplorer::LocalApplicationRun
public:
DesktopQmakeRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
- ~DesktopQmakeRunConfiguration() override;
bool isEnabled() const override;
QString disabledReason() const override;
diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp
index 3539bd62671..58aff22a635 100644
--- a/src/plugins/qmakeprojectmanager/makestep.cpp
+++ b/src/plugins/qmakeprojectmanager/makestep.cpp
@@ -93,10 +93,6 @@ void MakeStep::setMakeCommand(const QString &make)
m_makeCmd = make;
}
-MakeStep::~MakeStep()
-{
-}
-
QmakeBuildConfiguration *MakeStep::qmakeBuildConfiguration() const
{
return static_cast<QmakeBuildConfiguration *>(buildConfiguration());
diff --git a/src/plugins/qmakeprojectmanager/makestep.h b/src/plugins/qmakeprojectmanager/makestep.h
index 9b652f5d93e..8e60a0c4c1d 100644
--- a/src/plugins/qmakeprojectmanager/makestep.h
+++ b/src/plugins/qmakeprojectmanager/makestep.h
@@ -80,7 +80,6 @@ class QMAKEPROJECTMANAGER_EXPORT MakeStep : public ProjectExplorer::AbstractProc
public:
explicit MakeStep(ProjectExplorer::BuildStepList *bsl);
- ~MakeStep() override;
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp
index 02fcdb77d0d..9a556c244a6 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp
@@ -105,10 +105,6 @@ void QMakeStep::ctor()
setDefaultDisplayName(tr("qmake"));
}
-QMakeStep::~QMakeStep()
-{
-}
-
QmakeBuildConfiguration *QMakeStep::qmakeBuildConfiguration() const
{
return static_cast<QmakeBuildConfiguration *>(buildConfiguration());
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h
index f314433297e..bf014f2a677 100644
--- a/src/plugins/qmakeprojectmanager/qmakestep.h
+++ b/src/plugins/qmakeprojectmanager/qmakestep.h
@@ -129,7 +129,6 @@ class QMAKEPROJECTMANAGER_EXPORT QMakeStep : public ProjectExplorer::AbstractPro
public:
explicit QMakeStep(ProjectExplorer::BuildStepList *parent);
- ~QMakeStep() override;
QmakeBuildConfiguration *qmakeBuildConfiguration() const;
bool init() override;
diff --git a/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.cpp
index bd5c2222344..6c96f497ba9 100644
--- a/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.cpp
@@ -39,11 +39,6 @@ AbstractRemoteLinuxRunConfiguration::AbstractRemoteLinuxRunConfiguration(Project
}
-AbstractRemoteLinuxRunConfiguration::~AbstractRemoteLinuxRunConfiguration()
-{
-
-}
-
AbstractRemoteLinuxRunConfiguration::AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent,
AbstractRemoteLinuxRunConfiguration *source): RunConfiguration(parent, source)
{
diff --git a/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.h b/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.h
index 24d17df89c5..e66068f8ea8 100644
--- a/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/abstractremotelinuxrunconfiguration.h
@@ -48,8 +48,6 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxRunConfiguration :
public:
AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
- ~AbstractRemoteLinuxRunConfiguration() override;
-
virtual QString localExecutableFilePath() const = 0;
virtual QString remoteExecutableFilePath() const = 0;
virtual QStringList arguments() const = 0;
--
GitLab