aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2017-11-09 17:19:49 +0100
committerhjk <hjk@qt.io>2017-11-10 11:39:13 +0000
commit2d9aa5596dbbf8017aafc928d8efd711f2455d04 (patch)
tree0825e0a92c50ab66d236131d5b8e04f8e6e8cef3 /src
parent0965b9752dda468c9193d6eb93528e4f5988e8ec (diff)
RemoteLinux: Remove some unneeded code from GenericLinuxDeviceTester
Change-Id: Iabf995b340a521311f9f946c05e346ef07f4b3bf Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/remotelinux/linuxdevicetester.cpp11
-rw-r--r--src/plugins/remotelinux/linuxdevicetester.h6
2 files changed, 2 insertions, 15 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();