remotelinux: use base classes when appropriate

Change-Id: I9951c7470239e524f1bebb77f22b8ee59eab5183
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

src/plugins/remotelinux/remotelinuxdebugsupport.cpp

@@ -60,9 +60,9 @@ enum State { Inactive, StartingRunner, StartingRemoteProcess, Debugging };
 class AbstractRemoteLinuxDebugSupportPrivate
 {
 public:
-    AbstractRemoteLinuxDebugSupportPrivate(RemoteLinuxRunConfiguration *runConfig,
+    AbstractRemoteLinuxDebugSupportPrivate(RunConfiguration *runConfig,
             DebuggerEngine *engine)
-        : engine(engine), deviceConfig(runConfig->deviceConfig()),
+        : engine(engine),
           qmlDebugging(runConfig->debuggerAspect()->useQmlDebugger()),
           cppDebugging(runConfig->debuggerAspect()->useCppDebugger()),
           state(Inactive),
@@ -71,7 +71,6 @@ public:
     }
 
     const QPointer<Debugger::DebuggerEngine> engine;
-    const LinuxDeviceConfiguration::ConstPtr deviceConfig;
     bool qmlDebugging;
     bool cppDebugging;
     QByteArray gdbserverOutput;
@@ -95,7 +94,7 @@ using namespace Internal;
 DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const RemoteLinuxRunConfiguration *runConfig)
 {
     DebuggerStartParameters params;
-    const LinuxDeviceConfiguration::ConstPtr &devConf = runConfig->deviceConfig();
+    const IDevice::ConstPtr &devConf = runConfig->deviceConfig();
     if (runConfig->debuggerAspect()->useQmlDebugger()) {
         params.languages |= QmlLanguage;
         params.qmlServerAddress = runConfig->deviceConfig()->sshParameters().host;
@@ -135,7 +134,7 @@ DebuggerStartParameters AbstractRemoteLinuxDebugSupport::startParameters(const R
     return params;
 }
 
-AbstractRemoteLinuxDebugSupport::AbstractRemoteLinuxDebugSupport(RemoteLinuxRunConfiguration *runConfig,
+AbstractRemoteLinuxDebugSupport::AbstractRemoteLinuxDebugSupport(RunConfiguration *runConfig,
         DebuggerEngine *engine)
     : QObject(engine), d(new AbstractRemoteLinuxDebugSupportPrivate(runConfig, engine))
 {

src/plugins/remotelinux/remotelinuxdebugsupport.h

@@ -40,7 +40,11 @@ namespace Debugger {
 class DebuggerEngine;
 class DebuggerStartParameters;
 }
-namespace ProjectExplorer { class RunControl; }
+
+namespace ProjectExplorer {
+class RunControl;
+class RunConfiguration;
+}
 
 namespace RemoteLinux {
 class RemoteLinuxRunConfiguration;
@@ -58,7 +62,8 @@ class REMOTELINUX_EXPORT AbstractRemoteLinuxDebugSupport : public QObject
 public:
     static Debugger::DebuggerStartParameters startParameters(const RemoteLinuxRunConfiguration *runConfig);
 
-    AbstractRemoteLinuxDebugSupport(RemoteLinuxRunConfiguration *runConfig, Debugger::DebuggerEngine *engine);
+    AbstractRemoteLinuxDebugSupport(ProjectExplorer::RunConfiguration *runConfig,
+                                    Debugger::DebuggerEngine *engine);
     ~AbstractRemoteLinuxDebugSupport();
 
 private slots:

src/plugins/remotelinux/remotelinuxrunconfiguration.cpp

@@ -141,10 +141,6 @@ void RemoteLinuxRunConfiguration::init()
             this, SLOT(proFileUpdate(Qt4ProjectManager::Qt4ProFileNode*,bool,bool)));
 }
 
-RemoteLinuxRunConfiguration::~RemoteLinuxRunConfiguration()
-{
-}
-
 Qt4BaseTarget *RemoteLinuxRunConfiguration::qt4Target() const
 {
     return static_cast<Qt4BaseTarget *>(target());

src/plugins/remotelinux/remotelinuxrunconfiguration.h

@@ -73,7 +73,6 @@ public:
 
     RemoteLinuxRunConfiguration(Qt4ProjectManager::Qt4BaseTarget *parent, const Core::Id id,
         const QString &proFilePath);
-    virtual ~RemoteLinuxRunConfiguration();
 
     bool isEnabled() const;
     QString disabledReason() const;