From f5203796e42d25bca7569df1cc746bbe995ee548 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 29 Nov 2018 16:19:57 +0200
Subject: Git: Use ICore::dialogParent as dialog parent

Change-Id: Idc3f2f4d27d3279f76b688fac635e8d38b2705f5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/git/gitplugin.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/plugins/git/gitplugin.cpp')

diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 35ef47a978c..d74c17aa388 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -793,7 +793,7 @@ void GitPlugin::resetRepository()
     QTC_ASSERT(state.hasTopLevel(), return);
     QString topLevel = state.topLevel();
 
-    LogChangeDialog dialog(true, ICore::mainWindow());
+    LogChangeDialog dialog(true, ICore::dialogParent());
     ResetItemDelegate delegate(dialog.widget());
     dialog.setWindowTitle(tr("Undo Changes to %1").arg(QDir::toNativeSeparators(topLevel)));
     if (dialog.runDialog(topLevel, QString(), LogChangeWidget::IncludeRemotes))
@@ -818,7 +818,7 @@ void GitPlugin::startRebase()
     const QString topLevel = state.topLevel();
     if (topLevel.isEmpty() || !m_gitClient->canRebase(topLevel))
         return;
-    LogChangeDialog dialog(false, ICore::mainWindow());
+    LogChangeDialog dialog(false, ICore::dialogParent());
     RebaseItemDelegate delegate(dialog.widget());
     dialog.setWindowTitle(tr("Interactive Rebase"));
     if (!dialog.runDialog(topLevel))
@@ -832,7 +832,7 @@ void GitPlugin::startChangeRelatedAction(const Id &id)
     const VcsBasePluginState state = currentState();
 
     ChangeSelectionDialog dialog(state.hasTopLevel() ? state.topLevel() : PathChooser::homePath(),
-                                 id, ICore::mainWindow());
+                                 id, ICore::dialogParent());
 
     int result = dialog.exec();
 
@@ -1234,7 +1234,7 @@ void GitPlugin::applyPatch(const QString &workingDirectory, QString file)
     // Prompt for file
     if (file.isEmpty()) {
         const QString filter = tr("Patches (*.patch *.diff)");
-        file = QFileDialog::getOpenFileName(ICore::mainWindow(), tr("Choose Patch"), QString(), filter);
+        file = QFileDialog::getOpenFileName(ICore::dialogParent(), tr("Choose Patch"), QString(), filter);
         if (file.isEmpty()) {
             m_gitClient->endStashScope(workingDirectory);
             return;
@@ -1302,7 +1302,7 @@ template <class NonModalDialog>
         dialog->show();
         dialog->raise();
     } else {
-        dialog = new NonModalDialog(ICore::mainWindow());
+        dialog = new NonModalDialog(ICore::dialogParent());
         dialog->refresh(topLevel, true);
         dialog->show();
     }
-- 
cgit v1.2.3