MacroExpander: Fall back to global expander

... and use that all over the place.

Change-Id: Ie6e0ed0f0d9eaba9b4466761e6b455f33a905086
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

3 files changed, 6 insertions, 7 deletions

diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index c57299016b..7ae1079064 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1836,7 +1836,7 @@ void DebuggerEngine::validateExecutable(DebuggerStartParameters *sp)
             SourcePathRegExpMap globalRegExpSourceMap;
             globalRegExpSourceMap.reserve(options->sourcePathRegExpMap.size());
             foreach (auto entry, options->sourcePathRegExpMap) {
-                const QString expanded = Utils::globalMacroExpander()->expandedString(entry.second);
+                const QString expanded = Utils::globalMacroExpander()->expand(entry.second);
                 if (!expanded.isEmpty())
                     globalRegExpSourceMap.push_back(qMakePair(entry.first, expanded));
             }
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index d0bce30168..a7b233c15a 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -3334,7 +3334,7 @@ bool boolSetting(int code)
 QString stringSetting(int code)
 {
     QString raw = theDebuggerCore->m_debuggerSettings->item(code)->value().toString();
-    return globalMacroExpander()->expandedString(raw);
+    return globalMacroExpander()->expand(raw);
 }
 
 QStringList stringListSetting(int code)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 392e1cc8f8..92c0b26d26 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4404,9 +4404,8 @@ void GdbEngine::abortDebugger()
 void GdbEngine::resetInferior()
 {
     if (!startParameters().commandsForReset.isEmpty()) {
-        QByteArray substitutedCommands = globalMacroExpander()->expandedString(
-                    QString::fromLatin1(startParameters().commandsForReset)).toLatin1();
-        foreach (QByteArray command, substitutedCommands.split('\n')) {
+        QByteArray commands = globalMacroExpander()->expand(startParameters().commandsForReset);
+        foreach (QByteArray command, commands.split('\n')) {
             command = command.trimmed();
             if (!command.isEmpty()) {
                 if (state() == InferiorStopOk) {
@@ -4455,8 +4454,8 @@ void GdbEngine::handleInferiorPrepared()
     QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state());
 
     if (!sp.commandsAfterConnect.isEmpty()) {
-        QByteArray substitutedCommands = globalMacroExpander()->expandedString(QString::fromLatin1(sp.commandsAfterConnect)).toLatin1();
-        foreach (QByteArray command, substitutedCommands.split('\n')) {
+        QByteArray commands = globalMacroExpander()->expand(sp.commandsAfterConnect);
+        foreach (QByteArray command, commands.split('\n')) {
             postCommand(command);
         }
     }