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

Debugger: Replace some setRunParameters by individual property setters

Browse Source 
Change-Id: If19c917dae5475c7bedc1bb2e6f2655fd4e5ce1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-09-07 10:40:22 +02:00
parent 49c14f5616
commit 7458880298
1 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -979,7 +979,7 @@ public:
QPointer<RunConfiguration> m_previousRunConfiguration; QPointer<RunConfiguration> m_previousRunConfiguration;
Id m_previousMode; Id m_previousMode;
QVector<QPair<DebuggerRunParameters, Kit *>> m_scheduledStarts; QVector<DebuggerRunTool *> m_scheduledStarts;
ProxyAction *m_visibleStartAction = 0; ProxyAction *m_visibleStartAction = 0;
ProxyAction *m_hiddenStopAction = 0; ProxyAction *m_hiddenStopAction = 0;
@@ -1207,7 +1207,10 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
if (!kit) if (!kit)
kit = guessKitFromParameters(rp); kit = guessKitFromParameters(rp);
m_scheduledStarts.append(QPair<DebuggerRunParameters, Kit *>(rp, kit)); auto debugger = DebuggerRunTool::createFromKit(kit);
QTC_ASSERT(debugger, return false);
debugger->setRunParameters(rp);
m_scheduledStarts.append(debugger);
return true; return true;
} }
// -wincrashevent <event-handle>:<pid>. A handle used for // -wincrashevent <event-handle>:<pid>. A handle used for
@@ -1232,7 +1235,10 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
"does not match the pattern <handle>:<pid>.").arg(*it, option); "does not match the pattern <handle>:<pid>.").arg(*it, option);
return false; return false;
} }
m_scheduledStarts.append(QPair<DebuggerRunParameters, Kit *>(rp, findUniversalCdbKit())); auto debugger = DebuggerRunTool::createFromKit(findUniversalCdbKit());
QTC_ASSERT(debugger, return false);
debugger->setRunParameters(rp);
m_scheduledStarts.append(debugger);
return true; return true;
} }
@@ -1990,24 +1996,23 @@ void DebuggerPluginPrivate::attachCore()
void DebuggerPluginPrivate::startRemoteCdbSession() void DebuggerPluginPrivate::startRemoteCdbSession()
{ {
const QString connectionKey = "CdbRemoteConnection"; const QString connectionKey = "CdbRemoteConnection";
DebuggerRunParameters rp;
Kit *kit = findUniversalCdbKit(); Kit *kit = findUniversalCdbKit();
QTC_ASSERT(kit, return); QTC_ASSERT(kit, return);
rp.startMode = AttachToRemoteServer;
rp.closeMode = KillAtClose;
StartRemoteCdbDialog dlg(ICore::dialogParent()); StartRemoteCdbDialog dlg(ICore::dialogParent());
QString previousConnection = configValue(connectionKey).toString(); QString previousConnection = configValue(connectionKey).toString();
if (previousConnection.isEmpty()) if (previousConnection.isEmpty())
previousConnection = QLatin1String("localhost:1234"); previousConnection = "localhost:1234";
dlg.setConnection(previousConnection); dlg.setConnection(previousConnection);
if (dlg.exec() != QDialog::Accepted) if (dlg.exec() != QDialog::Accepted)
return; return;
rp.remoteChannel = dlg.connection(); setConfigValue(connectionKey, dlg.connection());
setConfigValue(connectionKey, rp.remoteChannel);
auto debugger = DebuggerRunTool::createFromKit(kit); auto debugger = DebuggerRunTool::createFromKit(kit);
QTC_ASSERT(debugger, return); QTC_ASSERT(debugger, return);
debugger->setRunParameters(rp); debugger->setStartMode(AttachToRemoteServer);
debugger->setCloseMode(KillAtClose);
debugger->setRemoteChannel(dlg.connection());
debugger->startRunControl(); debugger->startRunControl();
} }
@@ -2120,17 +2125,15 @@ RunControl *DebuggerPluginPrivate::attachToRunningProcess(Kit *kit,
return 0; return 0;
} }
DebuggerRunParameters rp;
rp.attachPID = ProcessHandle(process.pid);
rp.displayName = tr("Process %1").arg(process.pid);
rp.inferior.executable = process.exe;
rp.startMode = AttachExternal;
rp.closeMode = DetachAtClose;
rp.continueAfterAttach = contAfterAttach;
auto debugger = DebuggerRunTool::createFromKit(kit); auto debugger = DebuggerRunTool::createFromKit(kit);
QTC_ASSERT(debugger, return nullptr); QTC_ASSERT(debugger, return nullptr);
debugger->setRunParameters(rp); debugger->setAttachPid(ProcessHandle(process.pid));
debugger->setRunControlName(tr("Process %1").arg(process.pid));
debugger->setInferiorExecutable(process.exe);
debugger->setStartMode(AttachExternal);
debugger->setCloseMode(DetachAtClose);
debugger->setContinueAfterAttach(contAfterAttach);
debugger->startRunControl(); debugger->startRunControl();
return debugger->runControl(); return debugger->runControl();
@@ -2251,12 +2254,8 @@ void DebuggerPluginPrivate::enableReverseDebuggingTriggered(const QVariant &valu
void DebuggerPluginPrivate::runScheduled() void DebuggerPluginPrivate::runScheduled()
{ {
for (const QPair<DebuggerRunParameters, Kit *> pair : m_scheduledStarts) { for (DebuggerRunTool *debugger : m_scheduledStarts)
auto debugger = DebuggerRunTool::createFromKit(pair.second);
QTC_ASSERT(debugger, return);
debugger->setRunParameters(pair.first);
debugger->startRunControl(); debugger->startRunControl();
}
} }
void DebuggerPluginPrivate::editorOpened(IEditor *editor) void DebuggerPluginPrivate::editorOpened(IEditor *editor)