Debugger: Drop explicit (re-)expansions that are done by aspects now

Change-Id: Iae7d07db09642614620cc80658e08a7e900b57aa
Reviewed-by: Christian Stenger <[email protected]>

3 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index ba3cdb00d2a..8f4750033a4 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -364,7 +364,7 @@ void CdbEngine::setupEngine()
 
     debugger.addArgs({"-y", QChar('"') + s.cdbSymbolPaths().join(';') + '"'});
 
-    debugger.addArgs(expand(s.cdbAdditionalArguments()), CommandLine::Raw);
+    debugger.addArgs(s.cdbAdditionalArguments(), CommandLine::Raw);
 
     switch (sp.startMode) {
     case StartInternal:
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index dda51230ed1..b2224ac32b8 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1893,7 +1893,7 @@ QString DebuggerEngine::nativeStartupCommands() const
         return !trimmed.isEmpty() && !trimmed.startsWith('#');
     });
 
-    return expand(lines.join('\n'));
+    return lines.join('\n');
 }
 
 Perspective *DebuggerEngine::perspective() const
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index eac5bed04f5..406b5524473 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4042,7 +4042,7 @@ void GdbEngine::handleGdbStarted()
         runCommand(cmd);
     }
 
-    const QString commands = expand(settings().extraDumperCommands());
+    const QString commands = settings().extraDumperCommands();
     if (!commands.isEmpty())
         runCommand({commands});
 
@@ -4619,7 +4619,7 @@ void GdbEngine::handleLocalAttach(const DebuggerResponse &response)
     {
         showMessage("INFERIOR ATTACHED");
 
-        QString commands = expand(settings().gdbPostAttachCommands());
+        QString commands = settings().gdbPostAttachCommands();
         if (!commands.isEmpty())
             runCommand({commands, NativeCommand});
 
@@ -4799,7 +4799,7 @@ void GdbEngine::handleExecRun(const DebuggerResponse &response)
     if (response.resultClass == ResultRunning) {
 
         if (isLocalRunEngine()) {
-            QString commands = expand(settings().gdbPostAttachCommands());
+            QString commands = settings().gdbPostAttachCommands();
             if (!commands.isEmpty())
                 runCommand({commands, NativeCommand});
         }
@@ -4853,7 +4853,7 @@ void GdbEngine::handleTargetRemote(const DebuggerResponse &response)
         // gdb server will stop the remote application itself.
         showMessage("INFERIOR STARTED");
         showMessage(msgAttachedToStoppedInferior(), StatusBar);
-        QString commands = expand(settings().gdbPostAttachCommands());
+        QString commands = settings().gdbPostAttachCommands();
         if (!commands.isEmpty())
             runCommand({commands, NativeCommand});
         handleInferiorPrepared();
@@ -4869,7 +4869,7 @@ void GdbEngine::handleTargetExtendedRemote(const DebuggerResponse &response)
     if (response.resultClass == ResultDone) {
         showMessage("ATTACHED TO GDB SERVER STARTED");
         showMessage(msgAttachedToStoppedInferior(), StatusBar);
-        QString commands = expand(settings().gdbPostAttachCommands());
+        QString commands = settings().gdbPostAttachCommands();
         if (!commands.isEmpty())
             runCommand({commands, NativeCommand});
         if (runParameters().attachPID.isValid()) { // attach to pid if valid