From aed29ad8c3eb3e6c8bee19d6cd8dbccc46ac4f09 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 22 Jul 2022 13:27:19 +0200
Subject: Core: Remove #include <QMainWindow> from icore.h

Adapt users; also use dialogParent() instead of mainWindow() were
appropriate.

Change-Id: Ib60b118f05c986a70657446c5b2937074243bb5c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidavdmanager.cpp                |  1 +
 src/plugins/clangcodemodel/clangtextmark.cpp             |  1 +
 src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp     | 16 ++++++++--------
 src/plugins/coreplugin/actionmanager/actionmanager.cpp   |  1 +
 src/plugins/coreplugin/editormanager/editormanager.cpp   |  1 +
 src/plugins/coreplugin/icore.h                           |  2 +-
 src/plugins/coreplugin/locator/locator.cpp               |  1 +
 src/plugins/coreplugin/loggingviewer.cpp                 |  2 +-
 .../projectexplorer/miniprojecttargetselector.cpp        |  1 +
 .../assetexporterplugin/assetexportdialog.cpp            |  2 +-
 .../components/componentcore/designeractionmanager.cpp   |  6 +++---
 .../itemlibrary/itemlibraryassetimportdialog.cpp         |  2 +-
 .../components/itemlibrary/itemlibraryview.cpp           |  2 +-
 .../components/listmodeleditor/listmodeleditordialog.cpp |  1 +
 src/plugins/welcome/welcomeplugin.cpp                    |  4 ++--
 15 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/plugins/android/androidavdmanager.cpp b/src/plugins/android/androidavdmanager.cpp
index 611efa666e..af55cfb38e 100644
--- a/src/plugins/android/androidavdmanager.cpp
+++ b/src/plugins/android/androidavdmanager.cpp
@@ -39,6 +39,7 @@
 #include <QApplication>
 #include <QFileInfo>
 #include <QLoggingCategory>
+#include <QMainWindow>
 #include <QMessageBox>
 #include <QSettings>
 
diff --git a/src/plugins/clangcodemodel/clangtextmark.cpp b/src/plugins/clangcodemodel/clangtextmark.cpp
index c9c33dc595..bd6f493714 100644
--- a/src/plugins/clangcodemodel/clangtextmark.cpp
+++ b/src/plugins/clangcodemodel/clangtextmark.cpp
@@ -47,6 +47,7 @@
 
 #include <QAction>
 #include <QLayout>
+#include <QMainWindow>
 #include <QRegularExpression>
 #include <QRegularExpressionMatch>
 #include <QString>
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
index 165daf8bb3..57952a6ea8 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
@@ -412,14 +412,14 @@ bool CMakeBuildSystem::mustApplyConfigurationChangesArguments(const BuildDirPara
     if (parameters.configurationChangesArguments.isEmpty())
         return false;
 
-    auto answer = QMessageBox::question(Core::ICore::mainWindow(),
-                                        tr("Apply configuration changes?"),
-                                        "<p>" + tr("Run CMake with configuration changes?")
-                                            + "</p><pre>"
-                                            + parameters.configurationChangesArguments.join("\n")
-                                            + "</pre>",
-                                        QMessageBox::Apply | QMessageBox::Discard,
-                                        QMessageBox::Apply);
+    int answer = QMessageBox::question(Core::ICore::dialogParent(),
+                                       tr("Apply configuration changes?"),
+                                       "<p>" + tr("Run CMake with configuration changes?")
+                                       + "</p><pre>"
+                                       + parameters.configurationChangesArguments.join("\n")
+                                       + "</pre>",
+                                       QMessageBox::Apply | QMessageBox::Discard,
+                                       QMessageBox::Apply);
     return answer == QMessageBox::Apply;
 }
 
diff --git a/src/plugins/coreplugin/actionmanager/actionmanager.cpp b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
index b328bc3afd..40f43699ba 100644
--- a/src/plugins/coreplugin/actionmanager/actionmanager.cpp
+++ b/src/plugins/coreplugin/actionmanager/actionmanager.cpp
@@ -37,6 +37,7 @@
 #include <QAction>
 #include <QApplication>
 #include <QDebug>
+#include <QMainWindow>
 #include <QMenu>
 #include <QMenuBar>
 #include <QSettings>
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 48ce642313..fdc2ef2a42 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -94,6 +94,7 @@
 #include <QAction>
 #include <QApplication>
 #include <QFileDialog>
+#include <QMainWindow>
 #include <QMenu>
 #include <QMessageBox>
 #include <QPushButton>
diff --git a/src/plugins/coreplugin/icore.h b/src/plugins/coreplugin/icore.h
index 2b5fe2a949..518386b0ae 100644
--- a/src/plugins/coreplugin/icore.h
+++ b/src/plugins/coreplugin/icore.h
@@ -32,7 +32,6 @@
 #include <utils/qtcsettings.h>
 
 #include <QList>
-#include <QMainWindow>
 #include <QObject>
 #include <QRect>
 #include <QSettings>
@@ -40,6 +39,7 @@
 #include <functional>
 
 QT_BEGIN_NAMESPACE
+class QMainWindow;
 class QPrinter;
 class QStatusBar;
 class QWidget;
diff --git a/src/plugins/coreplugin/locator/locator.cpp b/src/plugins/coreplugin/locator/locator.cpp
index e29df61ac6..d8509cf826 100644
--- a/src/plugins/coreplugin/locator/locator.cpp
+++ b/src/plugins/coreplugin/locator/locator.cpp
@@ -58,6 +58,7 @@
 #include <utils/utilsicons.h>
 
 #include <QAction>
+#include <QMainWindow>
 #include <QSettings>
 
 using namespace Utils;
diff --git a/src/plugins/coreplugin/loggingviewer.cpp b/src/plugins/coreplugin/loggingviewer.cpp
index 2ecab8d774..8bd5a3dbd7 100644
--- a/src/plugins/coreplugin/loggingviewer.cpp
+++ b/src/plugins/coreplugin/loggingviewer.cpp
@@ -732,7 +732,7 @@ void LoggingViewManagerWidget::setCategoryColor(const QString &category, const Q
 void LoggingViewer::showLoggingView()
 {
     ActionManager::command(Constants::LOGGER)->action()->setEnabled(false);
-    auto widget = new LoggingViewManagerWidget(ICore::mainWindow());
+    auto widget = new LoggingViewManagerWidget(ICore::dialogParent());
     QObject::connect(widget, &QDialog::finished, widget, [widget] () {
         ActionManager::command(Constants::LOGGER)->action()->setEnabled(true);
         // explicitly disable manager again
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index a1095773b4..3afb6c9008 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -60,6 +60,7 @@
 #include <QLayout>
 #include <QList>
 #include <QListWidget>
+#include <QMainWindow>
 #include <QPainter>
 #include <QPixmap>
 #include <QStatusBar>
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
index c7850cff78..5992005dea 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
@@ -91,7 +91,7 @@ AssetExportDialog::AssetExportDialog(const Utils::FilePath &exportPath,
     m_ui->exportPath->setPromptDialogFilter(tr("Metadata file (*.metadata)"));
     m_ui->exportPath->lineEdit()->setReadOnly(true);
     m_ui->exportPath->addButton(tr("Open"), this, [this]() {
-        Core::FileUtils::showInGraphicalShell(Core::ICore::mainWindow(), m_ui->exportPath->filePath());
+        Core::FileUtils::showInGraphicalShell(Core::ICore::dialogParent(), m_ui->exportPath->filePath());
     });
 
     auto optionsWidget = new QWidget;
diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index a0bd7a2389..8dce682850 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
@@ -525,21 +525,21 @@ public:
 
         model.setListView(targetNode);
 
-        ListModelEditorDialog dialog{Core::ICore::mainWindow()};
+        ListModelEditorDialog dialog{Core::ICore::dialogParent()};
         dialog.setModel(&model);
 
         try {
             dialog.exec();
         } catch (const DocumentError &) {
             QMessageBox::warning(
-                Core::ICore::mainWindow(),
+                Core::ICore::dialogParent(),
                 QCoreApplication::translate("DesignerActionManager", "Document Has Errors"),
                 QCoreApplication::translate("DesignerActionManager",
                                             "The document which contains the list model "
                                             "contains errors. So we cannot edit it."));
         } catch (const RewritingException &) {
             QMessageBox::warning(
-                Core::ICore::mainWindow(),
+                Core::ICore::dialogParent(),
                 QCoreApplication::translate("DesignerActionManager", "Document Cannot Be Written"),
                 QCoreApplication::translate("DesignerActionManager",
                                             "An error occurred during a write attemp."));
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
index 898743859b..3b3b3d7f75 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
@@ -373,7 +373,7 @@ void ItemLibraryAssetImportDialog::updateImport(const ModelNode &updateNode,
                                         {sourceInfo.absoluteFilePath()},
                                         node.model()->fileUrl().toLocalFile(),
                                         supportedExts, supportedOpts, options,
-                                        preselectedFiles, Core::ICore::mainWindow());
+                                        preselectedFiles, Core::ICore::dialogParent());
                             importDlg->show();
 
                         } else {
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
index 2149049b00..954b57204e 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
@@ -169,7 +169,7 @@ void ItemLibraryView::updateImport3DSupport(const QVariantMap &supportMap)
             auto importDlg = new ItemLibraryAssetImportDialog(fileNames, defaultDir,
                                                               m_importableExtensions3DMap,
                                                               m_importOptions3DMap, {}, {},
-                                                              Core::ICore::mainWindow());
+                                                              Core::ICore::dialogParent());
             int result = importDlg->exec();
 
             return result == QDialog::Accepted ? AddFilesResult::Succeeded : AddFilesResult::Cancelled;
diff --git a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp
index 7e5c957f91..2d72b43552 100644
--- a/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp
+++ b/src/plugins/qmldesigner/components/listmodeleditor/listmodeleditordialog.cpp
@@ -37,6 +37,7 @@
 #include <QInputDialog>
 #include <QKeyEvent>
 #include <QLineEdit>
+#include <QMainWindow>
 #include <QTableView>
 #include <QToolBar>
 #include <QVBoxLayout>
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index d75a0b0bb5..998c602c41 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -147,7 +147,7 @@ public:
 
         auto introAction = new QAction(tr("UI Tour"), this);
         connect(introAction, &QAction::triggered, this, []() {
-            auto intro = new IntroductionWidget(ICore::mainWindow());
+            auto intro = new IntroductionWidget(ICore::dialogParent());
             intro->show();
         });
         Command *cmd = ActionManager::registerAction(introAction, "Welcome.UITour");
@@ -157,7 +157,7 @@ public:
 
         if (!arguments.contains("-notour")) {
             connect(ICore::instance(), &ICore::coreOpened, this, []() {
-                IntroductionWidget::askUserAboutIntroduction(ICore::mainWindow(),
+                IntroductionWidget::askUserAboutIntroduction(ICore::dialogParent(),
                                                              ICore::settings());
             }, Qt::QueuedConnection);
         }
-- 
cgit v1.2.1