Debugger: Transform a few fields of DebuggerRunParameters

Transform debugInfoLocation, debugSourceLocation and
qtSourceLocation.

Task-number: QTCREATORBUG-29168
Change-Id: Ia8c93092d1e8ad937d9aa0ab4b4208609772e9be
Reviewed-by: hjk <hjk@qt.io>

src/plugins/debugger/debuggerdialogs.cpp

@@ -415,7 +415,7 @@ void StartApplicationDialog::run(bool attachRemote)
         rp.setRemoteChannel(dev->sshParameters().host(), newParameters.serverPort);
     rp.setDisplayName(newParameters.displayName());
     rp.setBreakOnMain(newParameters.breakAtMain);
-    debugger->setDebugInfoLocation(newParameters.debugInfoLocation);
+    rp.setDebugInfoLocation(newParameters.debugInfoLocation);
     rp.setInferior(newParameters.runnable);
     rp.setCommandsAfterConnect(newParameters.serverInitCommands);
     rp.setCommandsForReset(newParameters.serverResetCommands);

src/plugins/debugger/debuggerengine.cpp

@@ -143,7 +143,7 @@ DebuggerRunParameters DebuggerRunParameters::fromRunControl(ProjectExplorer::Run
     params.m_version = DebuggerKitAspect::version(kit);
 
     if (QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit))
-        params.qtSourceLocation = qtVersion->sourcePath();
+        params.m_qtSourceLocation = qtVersion->sourcePath();
 
     if (auto aspect = runControl->aspectData<DebuggerRunConfigurationAspect>()) {
         if (!aspect->useCppDebugger)
@@ -243,13 +243,13 @@ Result DebuggerRunParameters::fixupParameters(ProjectExplorer::RunControl *runCo
     }
 
     if (settings().autoEnrichParameters()) {
-        if (debugInfoLocation.isEmpty())
+        if (m_debugInfoLocation.isEmpty())
-            debugInfoLocation = m_sysRoot / "/usr/lib/debug";
+            m_debugInfoLocation = m_sysRoot / "/usr/lib/debug";
-        if (debugSourceLocation.isEmpty()) {
+        if (m_debugSourceLocation.isEmpty()) {
             const QString base = m_sysRoot.toUrlishString() + "/usr/src/debug/";
-            debugSourceLocation.append(base + "qt5base/src/corelib");
+            m_debugSourceLocation.append(base + "qt5base/src/corelib");
-            debugSourceLocation.append(base + "qt5base/src/gui");
+            m_debugSourceLocation.append(base + "qt5base/src/gui");
-            debugSourceLocation.append(base + "qt5base/src/network");
+            m_debugSourceLocation.append(base + "qt5base/src/network");
         }
     }
 
@@ -2923,7 +2923,7 @@ QString DebuggerEngine::formatStartParameters() const
     if (!rp.qmlServer().host().isEmpty())
         str << "QML server: " << rp.qmlServer().host() << ':' << rp.qmlServer().port() << '\n';
     str << "Sysroot: " << rp.sysRoot() << '\n';
-    str << "Debug Source Location: " << rp.debugSourceLocation.join(':') << '\n';
+    str << "Debug Source Location: " << rp.debugSourceLocation().join(':') << '\n';
     return rc;
 }
 

src/plugins/debugger/debuggerengine.h

@@ -202,9 +202,13 @@ public:
     void setStartMessage(const QString &msg) { m_startMessage = msg; }
     // FIXME: Add a startMessage() getter and use it.
 
-    Utils::FilePath debugInfoLocation; // Gdb "set-debug-file-directory".
+    void setDebugInfoLocation(const Utils::FilePath &location) { m_debugInfoLocation = location; }
-    QStringList debugSourceLocation; // Gdb "directory"
+    Utils::FilePath debugInfoLocation() const { return m_debugInfoLocation; }
-    Utils::FilePath qtSourceLocation;
+
+    QStringList debugSourceLocation() const { return m_debugSourceLocation; }
+
+    Utils::FilePath qtSourceLocation() const { return m_qtSourceLocation; }
+
     ProjectExplorer::Abi toolChainAbi;
 
     Utils::FilePath projectSourceDirectory;
@@ -308,6 +312,9 @@ private:
     Utils::FilePath m_overrideStartScript; // Used in attach to core and remote debugging
 
     QString m_startMessage; // First status message shown.
+    Utils::FilePath m_debugInfoLocation; // Gdb "set-debug-file-directory".
+    QStringList m_debugSourceLocation; // Gdb "directory"
+    Utils::FilePath m_qtSourceLocation;
 };
 
 namespace Internal {

src/plugins/debugger/debuggerruncontrol.cpp

@@ -103,11 +103,6 @@ public:
 
 } // namespace Internal
 
-void DebuggerRunTool::setDebugInfoLocation(const FilePath &debugInfoLocation)
-{
-    m_runParameters.debugInfoLocation = debugInfoLocation;
-}
-
 void DebuggerRunTool::setTestCase(int testCase)
 {
     m_runParameters.testCase = testCase;

src/plugins/debugger/debuggerruncontrol.h

@@ -34,8 +34,6 @@ public:
 
     void setUseDebugServer(Utils::ProcessHandle attachPid, bool essential, bool useMulti);
 
-    void setDebugInfoLocation(const Utils::FilePath &debugInfoLocation);
-
     void setTestCase(int testCase);
 
     void kickoffTerminalProcess();

src/plugins/debugger/debuggersourcepathmappingwidget.cpp

@@ -419,7 +419,7 @@ void DebuggerSourcePathMappingWidget::slotEditTargetFieldChanged()
 SourcePathMap mergePlatformQtPath(const DebuggerRunParameters &sp, const SourcePathMap &in)
 {
     static const QString qglobal = "qtbase/src/corelib/global/qglobal.h";
-    const FilePath sourceLocation = sp.qtSourceLocation;
+    const FilePath sourceLocation = sp.qtSourceLocation();
     if (!(sourceLocation / qglobal).exists())
         return in;
 

src/plugins/debugger/gdb/gdbengine.cpp

@@ -3964,7 +3964,7 @@ void GdbEngine::handleGdbStarted()
     }
 
     // Spaces just will not work.
-    for (const QString &src : rp.debugSourceLocation) {
+    for (const QString &src : rp.debugSourceLocation()) {
         if (QDir(src).exists())
             runCommand({"directory " + src});
         else
@@ -4214,7 +4214,7 @@ void GdbEngine::handleInferiorPrepared()
 void GdbEngine::handleDebugInfoLocation(const DebuggerResponse &response)
 {
     if (response.resultClass == ResultDone) {
-        const FilePath debugInfoLocation = runParameters().debugInfoLocation;
+        const FilePath debugInfoLocation = runParameters().debugInfoLocation();
         if (!debugInfoLocation.isEmpty() && debugInfoLocation.exists()) {
             const QString curDebugInfoLocations = response.consoleStreamOutput.split('"').value(1);
             QString cmd = "set debug-file-directory " + debugInfoLocation.path();