From 2d9aa5596dbbf8017aafc928d8efd711f2455d04 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 9 Nov 2017 17:19:49 +0100 Subject: [PATCH] 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(-) diff --git a/src/plugins/remotelinux/linuxdevicetester.cpp b/src/plugins/remotelinux/linuxdevicetester.cpp index cbb84a442b8..c27bafb6a73 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 8c658bf150b..8a20edde037 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();