1 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 0fadcc150a..8ec83467b6 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -64,6 +64,7 @@
 #include <utils/qtcassert.h>
 #include <utils/qtcprocess.h>
 #include <utils/savedaction.h>
+#include <utils/stringutils.h>
 #include <utils/synchronousprocess.h>
 #include <utils/temporaryfile.h>
 
@@ -95,19 +96,19 @@ static int &currentToken()
     return token;
 }
 
-static bool isMostlyHarmlessMessage(const QStringRef &msg)
+static bool isMostlyHarmlessMessage(const QStringView msg)
 {
-    return msg == "warning: GDB: Failed to set controlling terminal: "
-                  "Inappropriate ioctl for device\\n"
-        || msg == "warning: GDB: Failed to set controlling terminal: "
-                  "Invalid argument\\n";
+    return msg == u"warning: GDB: Failed to set controlling terminal: "
+                   "Inappropriate ioctl for device\\n"
+        || msg == u"warning: GDB: Failed to set controlling terminal: "
+                   "Invalid argument\\n";
 }
 
 static QMessageBox *showMessageBox(QMessageBox::Icon icon,
                                    const QString &title, const QString &text,
                                    QMessageBox::StandardButtons buttons)
 {
-    auto mb = new QMessageBox(icon, title, text, buttons, ICore::mainWindow());
+    auto mb = new QMessageBox(icon, title, text, buttons, ICore::dialogParent());
     mb->setAttribute(Qt::WA_DeleteOnClose);
     mb->setTextInteractionFlags(Qt::TextSelectableByMouse);
     mb->show();
@@ -605,7 +606,7 @@ void GdbEngine::readDebuggeeOutput(const QByteArray &ba)
     const QString msg = m_inferiorOutputCodec->toUnicode(ba.constData(), ba.size(),
                                                          &m_inferiorOutputCodecState);
 
-    if (msg.startsWith("&\"") && isMostlyHarmlessMessage(msg.midRef(2, msg.size() - 4)))
+    if (msg.startsWith("&\"") && isMostlyHarmlessMessage(QStringView{msg}.mid(2, msg.size() - 4)))
         showMessage("Mostly harmless terminal warning suppressed.", LogWarning);
     else
         showMessage(msg, AppStuff);
@@ -2699,7 +2700,7 @@ void GdbEngine::handleShowModuleSections(const DebuggerResponse &response,
                     active = true;
             } else {
                 if (active) {
-                    QStringList items = line.split(' ', QString::SkipEmptyParts);
+                    QStringList items = line.split(' ', Utils::SkipEmptyParts);
                     QString fromTo = items.value(0, QString());
                     const int pos = fromTo.indexOf('-');
                     QTC_ASSERT(pos >= 0, continue);
@@ -3188,7 +3189,7 @@ void GdbEngine::handleRegisterListing(const DebuggerResponse &response)
     m_registers.clear();
     QStringList lines = response.consoleStreamOutput.split('\n');
     for (int i = 1; i < lines.size(); ++i) {
-        const QVector<QStringRef> parts = lines.at(i).splitRef(' ', QString::SkipEmptyParts);
+        const QVector<QStringRef> parts = lines.at(i).splitRef(' ', Utils::SkipEmptyParts);
         if (parts.size() < 7)
             continue;
         int gdbRegisterNumber = parts.at(1).toInt();
@@ -3637,7 +3638,6 @@ void GdbEngine::setupEngine()
     //runCommand("define hookpost-stop\nprint 5\nend");
     //runCommand("define hook-call\nprint 6\nend");
     //runCommand("define hookpost-call\nprint 7\nend");
-    runCommand({"set print object on"});
     //runCommand("set step-mode on");  // we can't work with that yes
     //runCommand("set exec-done-display on");
     //runCommand("set print pretty on");