From 2ec0bc9f6dccec001b26fdc5d7cb5baf3ada7b0d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 2 Oct 2009 20:00:52 +0200 Subject: [PATCH] remove useless code --tty + outputcollector, working dir and environment setup make sense only for living local debuggees. --- src/plugins/debugger/gdb/attachgdbadapter.cpp | 12 ------------ src/plugins/debugger/gdb/coregdbadapter.cpp | 12 ------------ src/plugins/debugger/gdb/remotegdbadapter.cpp | 16 ---------------- 3 files changed, 40 deletions(-) diff --git a/src/plugins/debugger/gdb/attachgdbadapter.cpp b/src/plugins/debugger/gdb/attachgdbadapter.cpp index 0918bf866c0..391ee2466b6 100644 --- a/src/plugins/debugger/gdb/attachgdbadapter.cpp +++ b/src/plugins/debugger/gdb/attachgdbadapter.cpp @@ -78,18 +78,6 @@ void AttachGdbAdapter::startAdapter() gdbArgs.prepend(_("mi")); gdbArgs.prepend(_("-i")); - if (!m_engine->m_outputCollector.listen()) { - emit adapterStartFailed(tr("Cannot set up communication with child process: %1") - .arg(m_engine->m_outputCollector.errorString()), QString()); - return; - } - gdbArgs.prepend(_("--tty=") + m_engine->m_outputCollector.serverName()); - - if (!startParameters().workingDir.isEmpty()) - setWorkingDirectory(startParameters().workingDir); - if (!startParameters().environment.isEmpty()) - setEnvironment(startParameters().environment); - QString location = theDebuggerStringSetting(GdbLocation); m_gdbProc.start(location, gdbArgs); } diff --git a/src/plugins/debugger/gdb/coregdbadapter.cpp b/src/plugins/debugger/gdb/coregdbadapter.cpp index 92edb42e68d..26eaaf7fbf4 100644 --- a/src/plugins/debugger/gdb/coregdbadapter.cpp +++ b/src/plugins/debugger/gdb/coregdbadapter.cpp @@ -78,18 +78,6 @@ void CoreGdbAdapter::startAdapter() gdbArgs.prepend(_("mi")); gdbArgs.prepend(_("-i")); - if (!m_engine->m_outputCollector.listen()) { - emit adapterStartFailed(tr("Cannot set up communication with child process: %1") - .arg(m_engine->m_outputCollector.errorString()), QString()); - return; - } - gdbArgs.prepend(_("--tty=") + m_engine->m_outputCollector.serverName()); - - if (!startParameters().workingDir.isEmpty()) - setWorkingDirectory(startParameters().workingDir); - if (!startParameters().environment.isEmpty()) - setEnvironment(startParameters().environment); - QString location = theDebuggerStringSetting(GdbLocation); m_gdbProc.start(location, gdbArgs); } diff --git a/src/plugins/debugger/gdb/remotegdbadapter.cpp b/src/plugins/debugger/gdb/remotegdbadapter.cpp index bdf57f6d70c..e69478cb6e4 100644 --- a/src/plugins/debugger/gdb/remotegdbadapter.cpp +++ b/src/plugins/debugger/gdb/remotegdbadapter.cpp @@ -86,18 +86,6 @@ void RemoteGdbAdapter::startAdapter() gdbArgs.prepend(_("mi")); gdbArgs.prepend(_("-i")); -// if (!m_engine->m_outputCollector.listen()) { -// emit adapterStartFailed(tr("Cannot set up communication with child process: %1") -// .arg(m_engine->m_outputCollector.errorString())); -// return; -// } -// gdbArgs.prepend(_("--tty=") + m_engine->m_outputCollector.serverName()); - - if (!startParameters().workingDir.isEmpty()) - setWorkingDirectory(startParameters().workingDir); - if (!startParameters().environment.isEmpty()) - setEnvironment(startParameters().environment); - QString location = theDebuggerStringSetting(GdbLocation); // FIXME: make asynchroneous @@ -106,10 +94,6 @@ void RemoteGdbAdapter::startAdapter() m_engine->showStatusMessage(_("No server start script given. " "Assuming server runs already.")); } else { - if (!startParameters().workingDir.isEmpty()) - m_uploadProc.setWorkingDirectory(startParameters().workingDir); - if (!startParameters().environment.isEmpty()) - m_uploadProc.setEnvironment(startParameters().environment); m_uploadProc.start(_("/bin/sh ") + startParameters().serverStartScript); m_uploadProc.waitForStarted(); }