From c12a7a224fec476c3dea6ca1e62c49d552e9760e Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 5 Jun 2012 15:36:38 +0200
Subject: [PATCH] remotelinux: use base classes when appropriate
Change-Id: I9951c7470239e524f1bebb77f22b8ee59eab5183
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
src/plugins/remotelinux/remotelinuxdebugsupport.cpp | 9 ++++-----
src/plugins/remotelinux/remotelinuxdebugsupport.h | 9 +++++++--
src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 4 ----
src/plugins/remotelinux/remotelinuxrunconfiguration.h | 1 -
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp b/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
index 176df268e5a..6a509ebb202 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.cpp
+++ b/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))
{
diff --git a/src/plugins/remotelinux/remotelinuxdebugsupport.h b/src/plugins/remotelinux/remotelinuxdebugsupport.h
index 104a43b585b..6f71cafdf15 100644
--- a/src/plugins/remotelinux/remotelinuxdebugsupport.h
+++ b/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:
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index f39af40b420..50c1a714e06 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/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());
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index 55ae2a740a2..e374d9c71f2 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/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;
--
GitLab