Utils: Centralize PersistentSettingsWriter's use of dialogParent()

Change-Id: Ifc3200f198391ef8121dd060debeb47f9d7039e7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
author: hjk <hjk@qt.io> 2025-02-06 17:38:17 +0100
committer: hjk <hjk@qt.io> 2025-02-18 10:34:44 +0000
commit: 2f8db1c4a4fb09d1abe79b5d9ec382fc29fb0f43 (patch)
tree: 60d04729150c355bcf91f380984f29069148c36f
parent: cefa188e8ab055cc05c35fe337b912a6d285f630 (diff)
10 files changed, 12 insertions, 17 deletions
diff --git a/src/libs/utils/persistentsettings.cpp b/src/libs/utils/persistentsettings.cpp
index 90454ca0dd1..dceab3fbc18 100644
--- a/src/libs/utils/persistentsettings.cpp
+++ b/src/libs/utils/persistentsettings.cpp
@@ -19,6 +19,7 @@
 #include <QXmlStreamWriter>
 
 #ifdef QT_GUI_LIB
+#include "guiutils.h"
 #include <QMessageBox>
 #endif
 
@@ -389,12 +390,12 @@ bool PersistentSettingsWriter::save(const Store &data, QString *errorString) con
 }
 
 #ifdef QT_GUI_LIB
-bool PersistentSettingsWriter::save(const Store &data, QWidget *parent) const
+bool PersistentSettingsWriter::save(const Store &data) const
 {
     QString errorString;
     const bool success = save(data, &errorString);
     if (!success)
-        QMessageBox::critical(parent, Tr::tr("File Error"), errorString);
+        QMessageBox::critical(dialogParent(), Tr::tr("File Error"), errorString);
     return success;
 }
 #endif // QT_GUI_LIB
diff --git a/src/libs/utils/persistentsettings.h b/src/libs/utils/persistentsettings.h
index 8092e8a0118..1a01bd01fa7 100644
--- a/src/libs/utils/persistentsettings.h
+++ b/src/libs/utils/persistentsettings.h
@@ -8,12 +8,6 @@
 #include "filepath.h"
 #include "store.h"
 
-#include <QVariant>
-
-QT_BEGIN_NAMESPACE
-class QWidget;
-QT_END_NAMESPACE
-
 namespace Utils {
 
 class QTCREATOR_UTILS_EXPORT PersistentSettingsReader
@@ -37,7 +31,7 @@ public:
 
     bool save(const Store &data, QString *errorString) const;
 #ifdef QT_GUI_LIB
-    bool save(const Store &data, QWidget *parent) const;
+    bool save(const Store &data) const;
 #endif
 
     FilePath fileName() const;
diff --git a/src/plugins/baremetal/debugserverprovidermanager.cpp b/src/plugins/baremetal/debugserverprovidermanager.cpp
index b32006d2c45..e4034896912 100644
--- a/src/plugins/baremetal/debugserverprovidermanager.cpp
+++ b/src/plugins/baremetal/debugserverprovidermanager.cpp
@@ -147,7 +147,7 @@ void DebugServerProviderManager::saveProviders()
         }
     }
     data.insert(countKeyC, count);
-    m_writer->save(data, Core::ICore::dialogParent());
+    m_writer->save(data);
 }
 
 QList<IDebugServerProvider *> DebugServerProviderManager::providers()
diff --git a/src/plugins/coreplugin/session.cpp b/src/plugins/coreplugin/session.cpp
index a174ddeec52..76d454feddb 100644
--- a/src/plugins/coreplugin/session.cpp
+++ b/src/plugins/coreplugin/session.cpp
@@ -781,7 +781,7 @@ bool SessionManager::saveSession()
     if (!d->m_writer || d->m_writer->fileName() != filePath)
         d->m_writer.reset(new PersistentSettingsWriter(filePath, "QtCreatorSession"));
 
-    const bool result = d->m_writer->save(data, ICore::dialogParent());
+    const bool result = d->m_writer->save(data);
     if (result) {
         if (!SessionManager::isDefaultVirgin())
             d->m_sessionDateTimes.insert(SessionManager::activeSession(),
diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp
index 6375228eac1..1a35b334293 100644
--- a/src/plugins/debugger/debuggeritemmanager.cpp
+++ b/src/plugins/debugger/debuggeritemmanager.cpp
@@ -934,7 +934,7 @@ void DebuggerItemModel::saveDebuggers()
         }
     });
     data.insert(DEBUGGER_COUNT_KEY, count);
-    m_writer.save(data, ICore::dialogParent());
+    m_writer.save(data);
 
     // Do not save default debuggers as they are set by the SDK.
 }
diff --git a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
index cad72ceaf3e..6d84bcbf641 100644
--- a/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
+++ b/src/plugins/projectexplorer/devicesupport/devicemanager.cpp
@@ -137,7 +137,7 @@ void DeviceManager::save()
         return;
     Store data;
     data.insert(DeviceManagerKey, variantFromStore(toMap()));
-    d->writer->save(data, Core::ICore::dialogParent());
+    d->writer->save(data);
 }
 
 static FilePath settingsFilePath(const QString &extension)
diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index dcd658ec1a7..4ba971c715d 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -383,7 +383,7 @@ void KitManager::saveKits()
                 d->m_defaultKit ? QString::fromLatin1(d->m_defaultKit->id().name()) : QString());
     data.insert(KIT_IRRELEVANT_ASPECTS_KEY,
                 transform<QVariantList>(d->m_irrelevantAspects, &Id::toSetting));
-    d->m_writer->save(data, ICore::dialogParent());
+    d->m_writer->save(data);
 }
 
 bool KitManager::isLoaded()
diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp
index c81a14844e3..e76e29d0da6 100644
--- a/src/plugins/qnx/qnxsettingspage.cpp
+++ b/src/plugins/qnx/qnxsettingspage.cpp
@@ -451,7 +451,7 @@ public:
         }
 
         data.insert(QNXConfigCountKey, count);
-        m_writer.save(data, Core::ICore::dialogParent());
+        m_writer.save(data);
     }
 
     void restoreConfigurations()
diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp
index 0ab378f5e6b..0c41c3ff1f4 100644
--- a/src/plugins/qtsupport/qtversionmanager.cpp
+++ b/src/plugins/qtsupport/qtversionmanager.cpp
@@ -411,7 +411,7 @@ void QtVersionManagerImpl::saveQtVersions()
         data.insert(numberedKey(QTVERSION_DATA_KEY, count), variantFromStore(tmp));
         ++count;
     }
-    m_writer->save(data, Core::ICore::dialogParent());
+    m_writer->save(data);
 }
 
 // Executes qtchooser with arguments in a process and returns its output
diff --git a/src/plugins/texteditor/codestylepool.cpp b/src/plugins/texteditor/codestylepool.cpp
index d593bae2e01..634933e1045 100644
--- a/src/plugins/texteditor/codestylepool.cpp
+++ b/src/plugins/texteditor/codestylepool.cpp
@@ -262,7 +262,7 @@ void CodeStylePool::exportCodeStyle(const FilePath &fileName, ICodeStylePreferen
         {codeStyleDataKey, variantFromStore(map)}
     };
     PersistentSettingsWriter writer(fileName, QLatin1String(codeStyleDocKey));
-    writer.save(tmp, Core::ICore::dialogParent());
+    writer.save(tmp);
 }
 
 } // TextEditor
author	hjk <hjk@qt.io>	2025-02-06 17:38:17 +0100
committer	hjk <hjk@qt.io>	2025-02-18 10:34:44 +0000
commit	2f8db1c4a4fb09d1abe79b5d9ec382fc29fb0f43 (patch)
tree	60d04729150c355bcf91f380984f29069148c36f
parent	cefa188e8ab055cc05c35fe337b912a6d285f630 (diff)