feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: de-noise

Browse Source 
Change-Id: I48c9b1353d80ebd85c81aa8a03d0be200781122a
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
hjk
2012-12-30 11:37:50 +01:00
parent 65b7874341
commit cbf75f676a
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -395,11 +395,6 @@ namespace PE = ProjectExplorer::Constants;
namespace Debugger { namespace Debugger {
namespace Constants {
} // namespace Constants
namespace Internal { namespace Internal {
// To be passed through margin menu action's data // To be passed through margin menu action's data
@@ -554,9 +549,9 @@ public:
// //
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
static inline QString executableForPid(qint64 pid) static QString executableForPid(qint64 pid)
{ {
foreach (const ProjectExplorer::DeviceProcess &p, ProjectExplorer::DeviceProcessList::localProcesses()) foreach (const DeviceProcess &p, DeviceProcessList::localProcesses())
if (p.pid == pid) if (p.pid == pid)
return p.exe; return p.exe;
return QString(); return QString();
@@ -672,11 +667,11 @@ bool fillParameters(DebuggerStartParameters *sp, const Kit *kit /* = 0 */, QStri
} }
// validate debugger if C++ debugging is enabled // validate debugger if C++ debugging is enabled
if (sp->languages & CppLanguage) { if (sp->languages & CppLanguage) {
const QList<ProjectExplorer::Task> tasks = DebuggerKitInformation::validateDebugger(kit); const QList<Task> tasks = DebuggerKitInformation::validateDebugger(kit);
if (!tasks.isEmpty()) { if (!tasks.isEmpty()) {
sp->startMode = NoStartMode; sp->startMode = NoStartMode;
if (errorMessage) { if (errorMessage) {
foreach (const ProjectExplorer::Task &t, tasks) { foreach (const Task &t, tasks) {
if (errorMessage->isEmpty()) if (errorMessage->isEmpty())
errorMessage->append(QLatin1Char('\n')); errorMessage->append(QLatin1Char('\n'));
errorMessage->append(t.description); errorMessage->append(t.description);
@@ -992,7 +987,7 @@ public slots:
void testBenchmark1(); void testBenchmark1();
public: public:
ProjectExplorer::Project *m_testProject; Project *m_testProject;
bool m_testSuccess; bool m_testSuccess;
QList<TestCallBack> m_testCallbacks; QList<TestCallBack> m_testCallbacks;
@@ -1698,8 +1693,8 @@ void DebuggerPluginPrivate::attachToProcess(bool startServerOnly)
} }
bool isWindows = false; bool isWindows = false;
if (const ProjectExplorer::ToolChain *tc = ToolChainKitInformation::toolChain(kit)) if (const ToolChain *tc = ToolChainKitInformation::toolChain(kit))
isWindows = tc->targetAbi().os() == ProjectExplorer::Abi::WindowsOS; isWindows = tc->targetAbi().os() == Abi::WindowsOS;
if (isWindows && isWinProcessBeingDebugged(process.pid)) { if (isWindows && isWinProcessBeingDebugged(process.pid)) {
QMessageBox::warning(ICore::mainWindow(), tr("Process Already Under Debugger Control"), QMessageBox::warning(ICore::mainWindow(), tr("Process Already Under Debugger Control"),
tr("The process %1 is already under the control of a debugger.\n" tr("The process %1 is already under the control of a debugger.\n"
@@ -1707,7 +1702,7 @@ void DebuggerPluginPrivate::attachToProcess(bool startServerOnly)
return; return;
} }
if (device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { if (device->type() == PE::DESKTOP_DEVICE_TYPE) {
DebuggerStartParameters sp; DebuggerStartParameters sp;
QTC_ASSERT(fillParameters(&sp, kit), return); QTC_ASSERT(fillParameters(&sp, kit), return);
sp.attachPID = process.pid; sp.attachPID = process.pid;
@@ -1722,7 +1717,7 @@ void DebuggerPluginPrivate::attachToProcess(bool startServerOnly)
} }
} }
void DebuggerPluginPrivate::attachExternalApplication(ProjectExplorer::RunControl *rc) void DebuggerPluginPrivate::attachExternalApplication(RunControl *rc)
{ {
DebuggerStartParameters sp; DebuggerStartParameters sp;
sp.attachPID = rc->applicationProcessHandle().pid(); sp.attachPID = rc->applicationProcessHandle().pid();
@@ -2840,8 +2835,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
connect(action(OperateByInstruction), SIGNAL(triggered(bool)), connect(action(OperateByInstruction), SIGNAL(triggered(bool)),
SLOT(handleOperateByInstructionTriggered(bool))); SLOT(handleOperateByInstructionTriggered(bool)));
ActionContainer *debugMenu = ActionContainer *debugMenu = ActionManager::actionContainer(PE::M_DEBUG);
ActionManager::actionContainer(ProjectExplorer::Constants::M_DEBUG);
// Dock widgets // Dock widgets
QDockWidget *dock = 0; QDockWidget *dock = 0;
@@ -3402,7 +3396,8 @@ using namespace Debugger::Internal;
This is the "external" interface of the debugger plugin that's visible This is the "external" interface of the debugger plugin that's visible
from Qt Creator core. The internal interface to global debugger from Qt Creator core. The internal interface to global debugger
functionality that is used by debugger views and debugger engines functionality that is used by debugger views and debugger engines
is DebuggerCore, implemented in DebuggerPluginPrivate. */ is DebuggerCore, implemented in DebuggerPluginPrivate.
*/
DebuggerPlugin::DebuggerPlugin() DebuggerPlugin::DebuggerPlugin()
{ {