1 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index c5073bd40f..8c05223843 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -69,7 +69,6 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/helpmanager.h>
 #include <coreplugin/icore.h>
-#include <coreplugin/id.h>
 #include <coreplugin/modemanager.h>
 
 #include <ssh/sshconnection.h>
@@ -776,7 +775,7 @@ void MemcheckToolPrivate::heobAction()
         executable.remove(0, wdSlashed.size());
 
     // heob arguments
-    HeobDialog dialog(Core::ICore::mainWindow());
+    HeobDialog dialog(Core::ICore::dialogParent());
     if (!dialog.exec())
         return;
     const QString heobArguments = dialog.arguments();
@@ -786,7 +785,7 @@ void MemcheckToolPrivate::heobAction()
     const QString heobPath = dialog.path() + '/' + heob;
     if (!QFile::exists(heobPath)) {
         QMessageBox::critical(
-            Core::ICore::mainWindow(),
+            Core::ICore::dialogParent(),
             MemcheckTool::tr("Heob"),
             MemcheckTool::tr("The %1 executables must be in the appropriate location.")
                 .arg("<a href=\"https://github.com/ssbssa/heob/releases\">Heob</a>"));
@@ -799,7 +798,7 @@ void MemcheckToolPrivate::heobAction()
         const QString dwarfstackPath = dialog.path() + '/' + dwarfstack;
         if (!QFile::exists(dwarfstackPath)
             && CheckableMessageBox::doNotShowAgainInformation(
-                   Core::ICore::mainWindow(),
+                   Core::ICore::dialogParent(),
                    MemcheckTool::tr("Heob"),
                    MemcheckTool::tr("Heob used with MinGW projects needs the %1 DLLs for proper "
                                     "stacktrace resolution.")
@@ -1015,7 +1014,7 @@ void MemcheckToolPrivate::loadShowXmlLogFile(const QString &filePath, const QStr
 void MemcheckToolPrivate::loadExternalXmlLogFile()
 {
     const QString filePath = QFileDialog::getOpenFileName(
-                ICore::mainWindow(),
+                ICore::dialogParent(),
                 MemcheckTool::tr("Open Memcheck XML Log File"),
                 QString(),
                 MemcheckTool::tr("XML Files (*.xml);;All Files (*)"));
@@ -1198,7 +1197,7 @@ HeobDialog::HeobDialog(QWidget *parent) :
 
     auto profilesLayout = new QHBoxLayout;
     m_profilesCombo = new QComboBox;
-    for (auto profile : m_profiles)
+    for (const auto &profile : m_profiles)
         m_profilesCombo->addItem(settings->value(profile + "/" + heobProfileNameC).toString());
     if (hasSelProfile) {
         int selIdx = m_profiles.indexOf(selProfile);
@@ -1390,7 +1389,7 @@ bool HeobDialog::attach() const
 
 QString HeobDialog::path() const
 {
-    return m_pathChooser->path();
+    return m_pathChooser->filePath().toString();
 }
 
 void HeobDialog::keyPressEvent(QKeyEvent *e)
@@ -1475,7 +1474,7 @@ void HeobDialog::saveOptions()
     settings->setValue(heobLeakRecordingC, m_leakRecordingCombo->currentIndex());
     settings->setValue(heobAttachC, m_attachCheck->isChecked());
     settings->setValue(heobExtraArgsC, m_extraArgsEdit->text());
-    settings->setValue(heobPathC, m_pathChooser->path());
+    settings->setValue(heobPathC, m_pathChooser->filePath().toString());
     settings->endGroup();
 }