From 2d9aa5596dbbf8017aafc928d8efd711f2455d04 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 9 Nov 2017 17:19:49 +0100 Subject: RemoteLinux: Remove some unneeded code from GenericLinuxDeviceTester Change-Id: Iabf995b340a521311f9f946c05e346ef07f4b3bf Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/linuxdevicetester.cpp | 11 ++--------- src/plugins/remotelinux/linuxdevicetester.h | 6 ------ 2 files changed, 2 insertions(+), 15 deletions(-) (limited to 'src/plugins/remotelinux') 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 -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(); -- cgit v1.2.1 From 5ca90a4a5e779f20f4c02c77efb24cdc9614f5fd Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 9 Nov 2017 16:06:19 +0100 Subject: ProjectExplorer: Fix copying of RunConfigurationAspects Moving aspect data closer to real Value semantics fixes the regression introduced by 890c1906e. Task-number: QTCREATORBUG-19186 Task-number: QTCREATORBUG-19192 Change-Id: Ieaeef3995ae06a817f266c1e2514f9e5793bd4e8 Reviewed-by: David Schulz Reviewed-by: Christian Kandeler --- .../remotelinux/remotelinuxcustomrunconfiguration.cpp | 12 ------------ src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h | 1 - src/plugins/remotelinux/remotelinuxenvironmentaspect.cpp | 5 ----- src/plugins/remotelinux/remotelinuxenvironmentaspect.h | 1 - src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 8 -------- src/plugins/remotelinux/remotelinuxrunconfiguration.h | 1 - 6 files changed, 28 deletions(-) (limited to 'src/plugins/remotelinux') 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 RemoteLinuxEnvironmentAspect::possibleBaseEnvironments() const { return QList() << static_cast(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 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(); -- cgit v1.2.1