Merge remote-tracking branch 'origin/4.5'

Change-Id: I60fca091b2eac67259580acba5ae934c16d74a83

8 files changed, 2 insertions, 43 deletions

diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp
index cbb84a442b..c27bafb6a7 100644
--- a/src/plugins/remotelinux/linuxdevicetester.cpp
+++ b/src/plugins/remotelinux/linuxdevicetester.cpp
@@ -45,13 +45,11 @@ enum State { Inactive, Connecting, RunningUname, TestingPorts };
 class GenericLinuxDeviceTesterPrivate
 {
 public:
-    GenericLinuxDeviceTesterPrivate() : connection(0), state(Inactive) {}
-
     IDevice::ConstPtr deviceConfiguration;
-    SshConnection *connection;
+    SshConnection *connection = nullptr;
     SshRemoteProcess::Ptr process;
     DeviceUsedPortsGatherer portsGatherer;
-    State state;
+    State state = Inactive;
 };
 
 } // namespace Internal
@@ -105,11 +103,6 @@ void GenericLinuxDeviceTester::stopTest()
     setFinished(TestFailure);
 }
 
-DeviceUsedPortsGatherer *GenericLinuxDeviceTester::usedPortsGatherer() const
-{
-    return &d->portsGatherer;
-}
-
 void GenericLinuxDeviceTester::handleConnected()
 {
     QTC_ASSERT(d->state == Connecting, return);
diff --git a/src/plugins/remotelinux/linuxdevicetester.h b/src/plugins/remotelinux/linuxdevicetester.h
index 8c658bf150..8a20edde03 100644
--- a/src/plugins/remotelinux/linuxdevicetester.h
+++ b/src/plugins/remotelinux/linuxdevicetester.h
@@ -29,10 +29,6 @@
 
 #include <projectexplorer/devicesupport/idevice.h>
 
-namespace ProjectExplorer { class DeviceUsedPortsGatherer; }
-namespace QSsh { class SshConnection; }
-namespace ProjectExplorer { class DeviceUsedPortsGatherer; }
-
 namespace RemoteLinux {
 
 namespace Internal { class GenericLinuxDeviceTesterPrivate; }
@@ -48,8 +44,6 @@ public:
     void testDevice(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration);
     void stopTest();
 
-    ProjectExplorer::DeviceUsedPortsGatherer *usedPortsGatherer() const;
-
 private:
     void handleConnected();
     void handleConnectionFailure();
diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
index 7ae8d9b9fa..9aed504bbe 100644
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
@@ -109,18 +109,6 @@ void RemoteLinuxCustomRunConfiguration::initialize()
     setDefaultDisplayName(runConfigDefaultDisplayName());
 }
 
-void RemoteLinuxCustomRunConfiguration::copyFrom(const RemoteLinuxCustomRunConfiguration *source)
-{
-    RunConfiguration::copyFrom(source);
-
-    m_localExecutable = source->m_localExecutable;
-    m_remoteExecutable = source->m_remoteExecutable;
-    m_arguments = source->m_arguments;
-    m_workingDirectory = source->m_workingDirectory;
-
-    setDefaultDisplayName(runConfigDefaultDisplayName());
-}
-
 bool RemoteLinuxCustomRunConfiguration::isConfigured() const
 {
     return !m_remoteExecutable.isEmpty();
diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
index 06d29cf48c..848e1a2801 100644
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
@@ -37,7 +37,6 @@ public:
     explicit RemoteLinuxCustomRunConfiguration(ProjectExplorer::Target *target);
 
     void initialize();
-    void copyFrom(const RemoteLinuxCustomRunConfiguration *source);
 
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
index c9910d5d09..7a2bc8c1ba 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp
@@ -55,11 +55,6 @@ RemoteLinuxEnvironmentAspect::RemoteLinuxEnvironmentAspect(ProjectExplorer::RunC
     setRunConfigWidgetCreator([this] { return new RemoteLinuxEnvironmentAspectWidget(this); });
 }
 
-RemoteLinuxEnvironmentAspect *RemoteLinuxEnvironmentAspect::create(ProjectExplorer::RunConfiguration *parent) const
-{
-    return new RemoteLinuxEnvironmentAspect(parent);
-}
-
 QList<int> RemoteLinuxEnvironmentAspect::possibleBaseEnvironments() const
 {
     return QList<int>() << static_cast<int>(RemoteBaseEnvironment)
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentaspect.h b/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
index 227d751906..4a3126340e 100644
--- a/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
+++ b/src/plugins/remotelinux/remotelinuxenvironmentaspect.h
@@ -37,7 +37,6 @@ class REMOTELINUX_EXPORT RemoteLinuxEnvironmentAspect : public ProjectExplorer::
 
 public:
     RemoteLinuxEnvironmentAspect(ProjectExplorer::RunConfiguration *rc);
-    RemoteLinuxEnvironmentAspect *create(ProjectExplorer::RunConfiguration *parent) const override;
 
     QList<int> possibleBaseEnvironments() const override;
     QString baseEnvironmentDisplayName(int base) const override;
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index ea8b4f6505..3195634c7a 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -88,14 +88,6 @@ void RemoteLinuxRunConfiguration::initialize(Core::Id id, const QString &targetN
     setDefaultDisplayName(defaultDisplayName());
 }
 
-void RemoteLinuxRunConfiguration::copyFrom(const RemoteLinuxRunConfiguration *source)
-{
-    RunConfiguration::copyFrom(source);
-    *d = *source->d;
-
-    setDefaultDisplayName(defaultDisplayName());
-}
-
 RemoteLinuxRunConfiguration::~RemoteLinuxRunConfiguration()
 {
     delete d;
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index b4ef39a737..9371eba983 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -75,7 +75,6 @@ signals:
 
 protected:
     void initialize(Core::Id id, const QString &targetName);
-    void copyFrom(const RemoteLinuxRunConfiguration *source);
 
     bool fromMap(const QVariantMap &map) override;
     QString defaultDisplayName();