From 3a45d763ca0ca61d5e86a91dc3d141cd6ea45726 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 13 Jun 2017 11:22:20 +0200 Subject: Debugger: Remove DebuggerStartParameters::connParams It's nowadays a duplicate of a subset of what DSP::remoteChannel provides. Change-Id: I95363bd392cb1d24fb1f1e0a2780c2c295929cea Reviewed-by: Christian Stenger --- src/plugins/debugger/debuggerdialogs.cpp | 9 ++++----- src/plugins/debugger/debuggerplugin.cpp | 3 ++- src/plugins/debugger/debuggerruncontrol.cpp | 8 -------- src/plugins/debugger/debuggerstartparameters.h | 1 - src/plugins/debugger/gdb/startgdbserverdialog.cpp | 6 ++---- src/plugins/qnx/qnxattachdebugsupport.cpp | 7 ++----- 6 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp index b9317da9d4..c247c22a43 100644 --- a/src/plugins/debugger/debuggerdialogs.cpp +++ b/src/plugins/debugger/debuggerdialogs.cpp @@ -385,6 +385,9 @@ bool StartApplicationDialog::run(QWidget *parent, DebuggerRunParameters *rp, Kit if (dialog.exec() != QDialog::Accepted) return false; + Kit *k = dialog.d->kitChooser->currentKit(); + IDevice::ConstPtr dev = DeviceKitInformation::device(k); + const StartApplicationParameters newParameters = dialog.parameters(); if (newParameters != history.back()) { history.append(newParameters); @@ -405,9 +408,7 @@ bool StartApplicationDialog::run(QWidget *parent, DebuggerRunParameters *rp, Kit if (!inputAddress.isEmpty()) rp->remoteChannel = inputAddress; else - rp->remoteChannel = rp->connParams.host; - if (!rp->remoteChannel.isEmpty()) - rp->remoteChannel += QLatin1Char(':') + QString::number(newParameters.serverPort); + rp->remoteChannel = QString("%1:%2").arg(dev->sshParameters().host).arg(newParameters.serverPort); rp->displayName = newParameters.displayName(); rp->inferior.workingDirectory = newParameters.runnable.workingDirectory; rp->useTerminal = newParameters.runnable.runMode == ApplicationLauncher::Console; @@ -417,8 +418,6 @@ bool StartApplicationDialog::run(QWidget *parent, DebuggerRunParameters *rp, Kit rp->serverStartScript = newParameters.serverStartScript; rp->debugInfoLocation = newParameters.debugInfoLocation; - Kit *k = dialog.d->kitChooser->currentKit(); - IDevice::ConstPtr dev = DeviceKitInformation::device(k); bool isLocal = !dev || (dev->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE); if (!attachRemote) rp->startMode = isLocal ? StartExternal : StartRemoteProcess; diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index a4cd4a9559..b91543b976 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -2177,7 +2177,8 @@ void DebuggerPluginPrivate::attachToQmlPort() IDevice::ConstPtr device = DeviceKitInformation::device(kit); if (device) { - rp.connParams = device->sshParameters(); + QSsh::SshConnectionParameters sshParameters = device->sshParameters(); + rp.remoteChannel = QString("%1:%2").arg(sshParameters.host).arg(sshParameters.port); Connection toolControl = device->toolControlChannel(IDevice::QmlControlChannel); QTC_ASSERT(toolControl.is(), return); rp.qmlServer.host = toolControl.as().host(); diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp index db0b072e1f..ebb839fc90 100644 --- a/src/plugins/debugger/debuggerruncontrol.cpp +++ b/src/plugins/debugger/debuggerruncontrol.cpp @@ -440,17 +440,9 @@ static bool fixupParameters(DebuggerRunParameters &rp, RunControl *runControl, Q if (rp.masterEngineType == NoEngineType) rp.masterEngineType = rp.cppEngineType; - if (device && rp.connParams.port == 0) - rp.connParams = device->sshParameters(); - - // Could have been set from command line. - if (rp.remoteChannel.isEmpty()) - rp.remoteChannel = rp.connParams.host + ':' + QString::number(rp.connParams.port); - if (rp.startMode == NoStartMode) rp.startMode = StartInternal; - if (runMode == DebugRunModeWithBreakOnMain) rp.breakOnMain = true; diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h index a53a3f46d2..92d379d6f2 100644 --- a/src/plugins/debugger/debuggerstartparameters.h +++ b/src/plugins/debugger/debuggerstartparameters.h @@ -71,7 +71,6 @@ public: // Used by general remote debugging. QString remoteChannel; - QSsh::SshConnectionParameters connParams; bool useExtendedRemote = false; // Whether to use GDB's target extended-remote or not. QString symbolFile; diff --git a/src/plugins/debugger/gdb/startgdbserverdialog.cpp b/src/plugins/debugger/gdb/startgdbserverdialog.cpp index 6a1da0cb86..1a583f6f5c 100644 --- a/src/plugins/debugger/gdb/startgdbserverdialog.cpp +++ b/src/plugins/debugger/gdb/startgdbserverdialog.cpp @@ -209,10 +209,8 @@ void GdbServerStarter::attach(int port) DebuggerRunParameters rp; rp.masterEngineType = GdbEngineType; - rp.connParams.host = d->device->sshParameters().host; - rp.connParams.port = port; - rp.remoteChannel = rp.connParams.host + QLatin1Char(':') + QString::number(rp.connParams.port); - rp.displayName = tr("Remote: \"%1:%2\"").arg(rp.connParams.host).arg(port); + rp.remoteChannel = QString("%1:%2").arg(d->device->sshParameters().host).arg(port); + rp.displayName = tr("Remote: \"%1\"").arg(rp.remoteChannel); rp.inferior.executable = localExecutable; rp.startMode = AttachToRemoteServer; rp.closeMode = KillAtClose; diff --git a/src/plugins/qnx/qnxattachdebugsupport.cpp b/src/plugins/qnx/qnxattachdebugsupport.cpp index aa8b5d7481..6cbe3594fd 100644 --- a/src/plugins/qnx/qnxattachdebugsupport.cpp +++ b/src/plugins/qnx/qnxattachdebugsupport.cpp @@ -121,11 +121,8 @@ void QnxAttachDebugSupport::attachToProcess() sp.attachPID = Utils::ProcessHandle(m_process.pid); sp.startMode = Debugger::AttachToRemoteServer; sp.closeMode = Debugger::DetachAtClose; - sp.connParams.port = m_pdebugPort.number(); - sp.remoteChannel = m_device->sshParameters().host + QLatin1Char(':') + - QString::number(m_pdebugPort.number()); - sp.displayName = tr("Remote: \"%1:%2\" - Process %3").arg(sp.connParams.host) - .arg(m_pdebugPort.number()).arg(m_process.pid); + sp.remoteChannel = QString("%1:%2").arg(m_device->sshParameters().host).arg(m_pdebugPort.number()); + sp.displayName = tr("Remote: \"%1\" - Process %2").arg(sp.remoteChannel).arg(m_process.pid); sp.inferior.executable = m_localExecutablePath; sp.useCtrlCStub = true; -- cgit v1.2.3