feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Pass dialog parent to Utils::* file dialog

Browse Source 
Amends 3edc5673b5.

Turns out quite a few potential uses have other parents than
ICore::dialogParent().

Use a nullptr parent to mean ICore::dialogParent() to keep the
caller side simple.

Change-Id: Icfe1daafd710ae273d286679e0c8e2a3a27da552
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-11 09:01:53 +02:00
parent 7726267d07
commit 8885ef7e5a
10 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/diffeditor/diffeditorplugin.cpp
View File

@@ -566,13 +566,13 @@ void DiffEditorPluginPrivate::diffOpenFiles()
void DiffEditorPluginPrivate::diffExternalFiles()
{
const FilePath filePath1 = FileUtils::getOpenFilePath(tr("Select First File for Diff"));
const FilePath filePath1 = FileUtils::getOpenFilePath(nullptr, tr("Select First File for Diff"));
if (filePath1.isEmpty())
return;
if (EditorManager::skipOpeningBigTextFile(filePath1))
return;
const FilePath filePath2 = FileUtils::getOpenFilePath(tr("Select Second File for Diff"));
const FilePath filePath2 = FileUtils::getOpenFilePath(nullptr, tr("Select Second File for Diff"));
if (filePath2.isEmpty())
return;
if (EditorManager::skipOpeningBigTextFile(filePath2))