ProjectExplorer/RemoteLinux/Qnx: Use centralized access to device

ToolRunner have access to the RunControl, which have a device.
No need for another copy anymore.

Change-Id: I1b71cf2fad9ecbadba859b7963175c1b7057f94d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 1 insertions, 8 deletions

diff --git a/src/plugins/qnx/qnxabstractrunsupport.cpp b/src/plugins/qnx/qnxabstractrunsupport.cpp
index 1e59df55bf..52d2110bb4 100644
--- a/src/plugins/qnx/qnxabstractrunsupport.cpp
+++ b/src/plugins/qnx/qnxabstractrunsupport.cpp
@@ -40,7 +40,6 @@ namespace Internal {
 
 QnxAbstractRunSupport::QnxAbstractRunSupport(RunControl *runControl)
     : ToolRunner(runControl)
-    , m_device(DeviceKitInformation::device(runControl->runConfiguration()->target()->kit()))
     , m_state(Inactive)
 {
     m_launcher = new ApplicationLauncher(this);
@@ -63,7 +62,7 @@ void QnxAbstractRunSupport::handleAdapterSetupRequested()
 void QnxAbstractRunSupport::handlePortListReady()
 {
     QTC_ASSERT(m_state == GatheringPorts, return);
-    m_portList = m_device->freePorts();
+    m_portList = device()->freePorts();
     startExecution();
 }
 
@@ -99,11 +98,6 @@ ApplicationLauncher *QnxAbstractRunSupport::appRunner() const
     return m_launcher;
 }
 
-const IDevice::ConstPtr QnxAbstractRunSupport::device() const
-{
-    return m_device;
-}
-
 void QnxAbstractRunSupport::handleProgressReport(const QString &)
 {
 }
diff --git a/src/plugins/qnx/qnxabstractrunsupport.h b/src/plugins/qnx/qnxabstractrunsupport.h
index 2a2eb15602..f0e9a58c5b 100644
--- a/src/plugins/qnx/qnxabstractrunsupport.h
+++ b/src/plugins/qnx/qnxabstractrunsupport.h
@@ -66,7 +66,6 @@ protected:
     void setState(State state);
 
     ProjectExplorer::ApplicationLauncher *appRunner() const;
-    const ProjectExplorer::IDevice::ConstPtr device() const;
 
 public slots:
     virtual void handleAdapterSetupRequested();