feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux: Remove some unneeded code from GenericLinuxDeviceTester

Browse Source 
Change-Id: Iabf995b340a521311f9f946c05e346ef07f4b3bf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2017-11-09 17:19:49 +01:00
parent 0965b9752d
commit 2d9aa5596d
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/remotelinux/linuxdevicetester.cpp
View File

@@ -45,13 +45,11 @@ enum State { Inactive, Connecting, RunningUname, TestingPorts };
class GenericLinuxDeviceTesterPrivate class GenericLinuxDeviceTesterPrivate
{ {
public: public:
GenericLinuxDeviceTesterPrivate() : connection(0), state(Inactive) {}
IDevice::ConstPtr deviceConfiguration; IDevice::ConstPtr deviceConfiguration;
SshConnection *connection; SshConnection *connection = nullptr;
SshRemoteProcess::Ptr process; SshRemoteProcess::Ptr process;
DeviceUsedPortsGatherer portsGatherer; DeviceUsedPortsGatherer portsGatherer;
State state; State state = Inactive;
}; };
} // namespace Internal } // namespace Internal
@@ -105,11 +103,6 @@ void GenericLinuxDeviceTester::stopTest()
setFinished(TestFailure); setFinished(TestFailure);
} }
DeviceUsedPortsGatherer *GenericLinuxDeviceTester::usedPortsGatherer() const
{
return &d->portsGatherer;
}
void GenericLinuxDeviceTester::handleConnected() void GenericLinuxDeviceTester::handleConnected()
{ {
QTC_ASSERT(d->state == Connecting, return); QTC_ASSERT(d->state == Connecting, return);

6
src/plugins/remotelinux/linuxdevicetester.h
View File

@@ -29,10 +29,6 @@
#include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/idevice.h>
namespace ProjectExplorer { class DeviceUsedPortsGatherer; }
namespace QSsh { class SshConnection; }
namespace ProjectExplorer { class DeviceUsedPortsGatherer; }
namespace RemoteLinux { namespace RemoteLinux {
namespace Internal { class GenericLinuxDeviceTesterPrivate; } namespace Internal { class GenericLinuxDeviceTesterPrivate; }
@@ -48,8 +44,6 @@ public:
void testDevice(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration); void testDevice(const ProjectExplorer::IDevice::ConstPtr &deviceConfiguration);
void stopTest(); void stopTest();
ProjectExplorer::DeviceUsedPortsGatherer *usedPortsGatherer() const;
private: private:
void handleConnected(); void handleConnected();
void handleConnectionFailure(); void handleConnectionFailure();