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

Debugger: Split off runtime-only items from DebuggerStartParameters

Browse Source 
Right now, DebuggerStartParameter is part of the debugger plugin
external interface. Better not make it fatter than necessary.

Change-Id: I3b9205089f971dd314ccba1335b5ca2d4d9fe7c6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
hjk
2015-05-27 13:59:56 +02:00
parent 28d2b16165
commit 244cdb7804
36 changed files with 543 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/plugins/debugger/debuggerdialogs.cpp
View File

@@ -358,9 +358,9 @@ void StartApplicationDialog::updateState()
d->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(okEnabled);
}
bool StartApplicationDialog::run(QWidget *parent, DebuggerStartParameters *sp)
bool StartApplicationDialog::run(QWidget *parent, DebuggerRunParameters *rp)
{
const bool attachRemote = sp->startMode == AttachToRemoteServer;
const bool attachRemote = rp->startMode == AttachToRemoteServer;
const QString settingsGroup = QLatin1String("DebugMode");
const QString arrayName = QLatin1String("StartApplication");
@@ -411,29 +411,29 @@ bool StartApplicationDialog::run(QWidget *parent, DebuggerStartParameters *sp)
Kit *kit = dialog.d->kitChooser->currentKit();
QTC_ASSERT(kit, return false);
bool res = DebuggerRunControlFactory::fillParametersFromKit(sp, kit);
bool res = fillParametersFromKit(rp, kit);
QTC_ASSERT(res, return false);
sp->executable = newParameters.localExecutable;
rp->executable = newParameters.localExecutable;
const QString inputAddress = dialog.d->serverAddressEdit->text();
if (!inputAddress.isEmpty())
sp->remoteChannel = inputAddress;
rp->remoteChannel = inputAddress;
else
sp->remoteChannel = sp->connParams.host;
sp->remoteChannel += QLatin1Char(':') + QString::number(newParameters.serverPort);
sp->displayName = newParameters.displayName();
sp->workingDirectory = newParameters.workingDirectory;
sp->useTerminal = newParameters.runInTerminal;
rp->remoteChannel = rp->connParams.host;
rp->remoteChannel += QLatin1Char(':') + QString::number(newParameters.serverPort);
rp->displayName = newParameters.displayName();
rp->workingDirectory = newParameters.workingDirectory;
rp->useTerminal = newParameters.runInTerminal;
if (!newParameters.processArgs.isEmpty())
sp->processArgs = newParameters.processArgs;
sp->breakOnMain = newParameters.breakAtMain;
sp->serverStartScript = newParameters.serverStartScript;
sp->debugInfoLocation = newParameters.debugInfoLocation;
rp->processArgs = newParameters.processArgs;
rp->breakOnMain = newParameters.breakAtMain;
rp->serverStartScript = newParameters.serverStartScript;
rp->debugInfoLocation = newParameters.debugInfoLocation;
IDevice::ConstPtr dev = DeviceKitInformation::device(kit);
bool isLocal = !dev || (dev->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE);
if (!attachRemote)
sp->startMode = isLocal ? StartExternal : StartRemoteProcess;
rp->startMode = isLocal ? StartExternal : StartRemoteProcess;
return true;
}