Debugger: Transform a few fields of DebuggerRunParameters

Transform crashParameter and nativeMixedEnabled.

Task-number: QTCREATORBUG-29168
Change-Id: I521a36e4d3897d045465413537af09459324efef
Reviewed-by: hjk <[email protected]>

6 files changed, 12 insertions, 18 deletions

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index f8cf295c7bf..8f73275965d 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -369,7 +369,7 @@ void CdbEngine::setupEngine()
     case AttachToCrashedProcess:
         debugger.addArgs({"-p", QString::number(sp.attachPid().pid())});
         if (sp.startMode() == AttachToCrashedProcess) {
-            debugger.addArgs({"-e", sp.crashParameter, "-g"});
+            debugger.addArgs({"-e", sp.crashParameter(), "-g"});
         } else {
             // TODO: Dead branch?
             if (usesTerminal())
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 0ce9529f2c9..be5692db1a7 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -188,7 +188,7 @@ DebuggerRunParameters DebuggerRunParameters::fromRunControl(ProjectExplorer::Run
     bool ok = false;
     const int nativeMixedOverride = qtcEnvironmentVariableIntValue("QTC_DEBUGGER_NATIVE_MIXED", &ok);
     if (ok)
-        params.nativeMixedEnabled = bool(nativeMixedOverride);
+        params.m_nativeMixedEnabled = bool(nativeMixedOverride);
 
     if (QtSupport::QtVersion *baseQtVersion = QtSupport::QtKitAspect::qtVersion(kit)) {
         const QVersionNumber qtVersion = baseQtVersion->qtVersion();
@@ -256,7 +256,7 @@ Result DebuggerRunParameters::fixupParameters(ProjectExplorer::RunControl *runCo
     if (m_isQmlDebugging) {
         QmlDebugServicesPreset service;
         if (isCppDebugging()) {
-            if (nativeMixedEnabled) {
+            if (m_nativeMixedEnabled) {
                 service = QmlNativeDebuggerServices;
             } else {
                 service = QmlDebuggerServices;
@@ -265,7 +265,7 @@ Result DebuggerRunParameters::fixupParameters(ProjectExplorer::RunControl *runCo
             service = QmlDebuggerServices;
         }
         if (m_startMode != AttachToLocalProcess && m_startMode != AttachToCrashedProcess) {
-            const QString qmlarg = isCppDebugging() && nativeMixedEnabled
+            const QString qmlarg = isCppDebugging() && m_nativeMixedEnabled
                                  ? qmlDebugNativeArguments(service, false)
                                  : qmlDebugTcpArguments(service, m_qmlServer);
             m_inferior.command.addArg(qmlarg);
@@ -341,7 +341,7 @@ bool DebuggerRunParameters::isCppDebugging() const
 
 bool DebuggerRunParameters::isNativeMixedDebugging() const
 {
-    return nativeMixedEnabled && isCppDebugging() && m_isQmlDebugging;
+    return m_nativeMixedEnabled && isCppDebugging() && m_isQmlDebugging;
 }
 
 namespace Internal {
@@ -2910,7 +2910,7 @@ QString DebuggerEngine::formatStartParameters() const
     if (!rp.coreFile().isEmpty())
         str << "Core: " << rp.coreFile().toUserOutput() << '\n';
     if (rp.attachPid().isValid())
-        str << "PID: " << rp.attachPid().pid() << ' ' << rp.crashParameter << '\n';
+        str << "PID: " << rp.attachPid().pid() << ' ' << rp.crashParameter() << '\n';
     if (!rp.projectSourceDirectory().isEmpty()) {
         str << "Project: " << rp.projectSourceDirectory().toUserOutput() << '\n';
         str << "Additional Search Directories:";
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 800cc6a82b4..1c1824cd3d6 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -227,10 +227,8 @@ public:
     void setMainScript(const Utils::FilePath &path) { m_mainScript = path; }
     Utils::FilePath mainScript() const { return m_mainScript; }
 
-    // Used by AttachCrashedExternal.
-    QString crashParameter;
-
-    bool nativeMixedEnabled = false;
+    void setCrashParameter(const QString &event) { m_crashParameter = event; }
+    QString crashParameter() const { return m_crashParameter; }
 
     bool isCppDebugging() const;
     bool isNativeMixedDebugging() const;
@@ -330,6 +328,9 @@ private:
 
     Utils::FilePath m_interpreter; // Used by Script debugging
     Utils::FilePath m_mainScript; // Used by Script debugging
+
+    QString m_crashParameter; // Used by AttachCrashedExternal.
+    bool m_nativeMixedEnabled = false;
 };
 
 namespace Internal {
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 79948cf99c6..33675c31699 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1441,7 +1441,7 @@ bool DebuggerPluginPrivate::parseArgument(QStringList::const_iterator &it,
         auto debugger = new DebuggerRunTool(runControl);
         DebuggerRunParameters &rp = debugger->runParameters();
         rp.setStartMode(AttachToCrashedProcess);
-        debugger->setCrashParameter(it->section(':', 0, 0));
+        rp.setCrashParameter(it->section(':', 0, 0));
         rp.setAttachPid(pid);
         rp.setDisplayName(Tr::tr("Crashed process %1").arg(pid));
         rp.setStartMessage(Tr::tr("Attaching to crashed process %1").arg(pid));
diff --git a/src/plugins/debugger/debuggerruncontrol.cpp b/src/plugins/debugger/debuggerruncontrol.cpp
index 84760e6ca4b..d1acc6a0bd2 100644
--- a/src/plugins/debugger/debuggerruncontrol.cpp
+++ b/src/plugins/debugger/debuggerruncontrol.cpp
@@ -118,11 +118,6 @@ void DebuggerRunTool::modifyDebuggerEnvironment(const EnvironmentItems &items)
     m_runParameters.debugger().environment.modify(items);
 }
 
-void DebuggerRunTool::setCrashParameter(const QString &event)
-{
-    m_runParameters.crashParameter = event;
-}
-
 void DebuggerRunTool::start()
 {
     startCoreFileSetupIfNeededAndContinueStartup();
diff --git a/src/plugins/debugger/debuggerruncontrol.h b/src/plugins/debugger/debuggerruncontrol.h
index d4c2a4ea81f..463f3ace57d 100644
--- a/src/plugins/debugger/debuggerruncontrol.h
+++ b/src/plugins/debugger/debuggerruncontrol.h
@@ -30,8 +30,6 @@ public:
     void start() override;
     void stop() override;
 
-    void setCrashParameter(const QString &event);
-
     void setUseDebugServer(Utils::ProcessHandle attachPid, bool essential, bool useMulti);
 
     void setTestCase(int testCase);