From cd2dec1af809622c1e40311aff8a8c99296f43ea Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 24 Jan 2012 12:34:10 +0100
Subject: [PATCH] debugger: remove SymbianDebugClient enum
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
There is only CODA nowadays.
Change-Id: I8350baed5b66947593c5850491ac9606af3b737c
Reviewed-by: Paweł Polański <pawel.3.polanski@nokia.com>
---
src/plugins/debugger/debuggerstartparameters.h | 8 +-------
src/plugins/debugger/gdb/gdbengine.cpp | 4 +---
.../qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp | 2 --
3 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h
index 220229e4abe..3e983e2cfca 100644
--- a/src/plugins/debugger/debuggerstartparameters.h
+++ b/src/plugins/debugger/debuggerstartparameters.h
@@ -56,10 +56,6 @@ public:
CommunicationChannelUsb
};
- enum SymbianDebugClient {
- SymbianDebugClientCoda
- };
-
DebuggerStartParameters()
: isSnapshot(false),
attachPID(-1),
@@ -73,8 +69,7 @@ public:
startMode(NoStartMode),
executableUid(0),
communicationChannel(CommunicationChannelTcpIp),
- serverPort(0),
- debugClient(SymbianDebugClientCoda)
+ serverPort(0)
{}
QString executable;
@@ -130,7 +125,6 @@ public:
CommunicationChannel communicationChannel;
QString serverAddress;
quint16 serverPort;
- SymbianDebugClient debugClient;
};
} // namespace Debugger
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index b05014caec4..17362638a63 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1933,9 +1933,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter()
const DebuggerStartParameters &sp = startParameters();
if (sp.toolChainAbi.os() == Abi::SymbianOS) {
// FIXME: 1 of 3 testing hacks.
- if (sp.debugClient == DebuggerStartParameters::SymbianDebugClientCoda)
- return new CodaGdbAdapter(this);
- return 0;
+ return new CodaGdbAdapter(this);
}
switch (sp.startMode) {
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp
index 1160ae9bd7a..85aa9005bf4 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicedebugruncontrol.cpp
@@ -110,8 +110,6 @@ static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceR
Debugger::DebuggerStartParameters::CommunicationChannelTcpIp:
Debugger::DebuggerStartParameters::CommunicationChannelUsb;
- sp.debugClient = Debugger::DebuggerStartParameters::SymbianDebugClientCoda;
-
if (const ProjectExplorer::Project *project = rc->target()->project()) {
sp.projectSourceDirectory = project->projectDirectory();
if (const ProjectExplorer::BuildConfiguration *buildConfig = rc->target()->activeBuildConfiguration()) {
--
GitLab