Adapt to KConfigGroup name officially being a QString type

GIT_SILENT

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 34d2102ef0e83df6e5a90fb3fc09cf105c11436b..26d6eb238a1830ef0ece33b385cf424168457de1 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -357,7 +357,7 @@ void DolphinContextMenu::insertDefaultItemActions(const KFileItemListProperties
     addSeparator();
 
     // Insert 'Move to Trash' and/or 'Delete'
-    const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) || !properties.isLocal());
+    const bool showDeleteAction = (KSharedConfig::openConfig()->group(QStringLiteral("KDE")).readEntry("ShowDeleteCommand", false) || !properties.isLocal());
     const bool showMoveToTrashAction = (properties.isLocal() && properties.supportsMoving());
 
     if (showDeleteAction && showMoveToTrashAction) {

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 6d630b1e063c71043f3d0aface9b646f456cfb7b..4ba1f074202797df724f1c0b3cfeb85a2841747c 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -388,7 +388,8 @@ void DolphinPart::slotOpenContextMenu(const QPoint &pos, const KFileItem &_item,
         const bool supportsMoving = capabilities.supportsMoving();
 
         if (capabilities.supportsDeleting()) {
-            const bool showDeleteAction = (KSharedConfig::openConfig()->group("KDE").readEntry("ShowDeleteCommand", false) || !item.isLocalFile());
+            const bool showDeleteAction =
+                (KSharedConfig::openConfig()->group(QStringLiteral("KDE")).readEntry("ShowDeleteCommand", false) || !item.isLocalFile());
             const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving;
 
             if (showDeleteAction && showMoveToTrashAction) {
@@ -460,7 +461,7 @@ void DolphinPart::openSelectionDialog(const QString &title, const QString &text,
     dialog->setWindowTitle(title);
     dialog->setLabelText(text);
 
-    const KConfigGroup group = KSharedConfig::openConfig("dolphinpartrc")->group("Select Dialog");
+    const KConfigGroup group = KSharedConfig::openConfig("dolphinpartrc")->group(QStringLiteral("Select Dialog"));
     dialog->setComboBoxEditable(true);
     dialog->setComboBoxItems(group.readEntry("History", QStringList()));
 
@@ -475,7 +476,7 @@ void DolphinPart::openSelectionDialog(const QString &title, const QString &text,
 
             // Need to evaluate this again here, because the captured value is const
             // (even if the const were removed from 'const KConfigGroup group =' above).
-            KConfigGroup group = KSharedConfig::openConfig("dolphinpartrc")->group("Select Dialog");
+            KConfigGroup group = KSharedConfig::openConfig("dolphinpartrc")->group(QStringLiteral("Select Dialog"));
             // Limit the size of the saved history.
             group.writeEntry("History", items.mid(0, 10));
             group.sync();

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 1e0fd527e924c07ecd5c6fe7f7019d44668ea0ac..1326bee1ff6d7adf0e98fbfdf12146a190c5cc75 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -727,7 +727,7 @@ void DolphinViewContainer::slotfileMiddleClickActivated(const KFileItem &item)
     auto mimeType = item.currentMimeType();
     if (item.isLocalFile() && mimeType.inherits(QStringLiteral("application/x-executable")) && mimeType.inherits(QStringLiteral("text/plain"))
         && QFileInfo(item.localPath()).isExecutable()) {
-        KConfigGroup cfgGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), "Executable scripts");
+        KConfigGroup cfgGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), QStringLiteral("Executable scripts"));
         const QString value = cfgGroup.readEntry("behaviourOnLaunch", "alwaysAsk");
 
         // in case KIO::WidgetsOpenOrExecuteFileHandler::promptUserOpenOrExecute would not open the file

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 795b85a44f3909d55f4c432e0c20dca6d6705ab2..e6e8ea25dc99ec49ea0686a38c9536d8405bedfb 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -92,7 +92,7 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel *model, QO
 {
     Q_ASSERT(model);
 
-    const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));
     m_enabledPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());
     m_localFileSizePreviewLimit = static_cast<qulonglong>(globalConfig.readEntry("MaximumSize", 0));
 

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index fb985ba23c67f4cdb9fc419887806e2c2f795129..901b2ac15d2abb46bd59f120fd8d423bd2a3eaf7 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -276,7 +276,7 @@ void KItemListWidget::setHovered(bool hovered)
 
         hoverSequenceStarted();
 
-        const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
+        const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));
         const int interval = globalConfig.readEntry("HoverSequenceInterval", 700);
 
         m_hoverSequenceTimer.start(interval);

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 419d174e90ace364d9fc432534dbe8f64a43a69c..ec1ccb4d637089a7733a5027c7a3dac55b886c29 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -75,7 +75,7 @@ void TreeViewContextMenu::open(const QPoint &pos)
 
         // insert 'Move to Trash' and (optionally) 'Delete'
         KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::IncludeGlobals);
-        KConfigGroup configGroup(globalConfig, "KDE");
+        KConfigGroup configGroup(globalConfig, QStringLiteral("KDE"));
         bool showDeleteCommand = configGroup.readEntry("ShowDeleteCommand", false);
 
         const QUrl url = m_fileItem.url();

diff --git a/src/settings/contextmenu/contextmenusettingspage.cpp b/src/settings/contextmenu/contextmenusettingspage.cpp
index a1fada2adc8c4dde1a6e2d6b29163be2ab18c95f..c401c2d6b6b1a4947bf1316eb7794475acfa9f85 100644 (file)
--- a/src/settings/contextmenu/contextmenusettingspage.cpp
+++ b/src/settings/contextmenu/contextmenusettingspage.cpp
@@ -166,7 +166,7 @@ void ContextMenuSettingsPage::applySettings()
     }
 
     KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);
-    KConfigGroup showGroup = config.group("Show");
+    KConfigGroup showGroup = config.group(QStringLiteral("Show"));
 
     QStringList enabledPlugins;
 
@@ -181,7 +181,7 @@ void ContextMenuSettingsPage::applySettings()
             }
         } else if (service == QLatin1String(DeleteService)) {
             KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::NoGlobals);
-            KConfigGroup configGroup(globalConfig, "KDE");
+            KConfigGroup configGroup(globalConfig, QStringLiteral("KDE"));
             configGroup.writeEntry("ShowDeleteCommand", checked);
             configGroup.sync();
         } else if (service == QLatin1String(CopyToMoveToService)) {
@@ -241,7 +241,7 @@ void ContextMenuSettingsPage::showEvent(QShowEvent *event)
 
         // Add "Show 'Delete' command" as service
         KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::IncludeGlobals);
-        KConfigGroup configGroup(globalConfig, "KDE");
+        KConfigGroup configGroup(globalConfig, QStringLiteral("KDE"));
         addRow(QStringLiteral("edit-delete"), i18nc("@option:check", "Delete"), DeleteService, configGroup.readEntry("ShowDeleteCommand", ShowDeleteDefault));
 
         // Add "Show 'Copy To' and 'Move To' commands" as service
@@ -270,7 +270,7 @@ void ContextMenuSettingsPage::showEvent(QShowEvent *event)
 void ContextMenuSettingsPage::loadServices()
 {
     const KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);
-    const KConfigGroup showGroup = config.group("Show");
+    const KConfigGroup showGroup = config.group(QStringLiteral("Show"));
 
     // Load generic services
     const auto locations = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio/servicemenus"), QStandardPaths::LocateDirectory);

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 8c41794e93b593d9b11a9ffeda3b6208c44c7dd3..c564dd196c0b692232c8fc8bc8a052e2f5f2f611 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -112,13 +112,13 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl &url, QWidget *parent, K
     }
 #endif
 
-    const KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), "SettingsDialog");
+    const KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), QStringLiteral("SettingsDialog"));
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 }
 
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
-    KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), "SettingsDialog");
+    KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), QStringLiteral("SettingsDialog"));
     KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
 

diff --git a/src/settings/interface/confirmationssettingspage.cpp b/src/settings/interface/confirmationssettingspage.cpp
index 5f1abb4cd66251902fbbe12f5a00f55c98b80478..c43ff0474cc7941b7d6f46868b0b8f67a9fb0d4c 100644 (file)
--- a/src/settings/interface/confirmationssettingspage.cpp
+++ b/src/settings/interface/confirmationssettingspage.cpp
@@ -114,12 +114,12 @@ ConfirmationsSettingsPage::~ConfirmationsSettingsPage()
 void ConfirmationsSettingsPage::applySettings()
 {
     KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig(QStringLiteral("kiorc"), KConfig::NoGlobals);
-    KConfigGroup confirmationGroup(kioConfig, "Confirmations");
+    KConfigGroup confirmationGroup(kioConfig, QStringLiteral("Confirmations"));
     confirmationGroup.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
     confirmationGroup.writeEntry("ConfirmEmptyTrash", m_confirmEmptyTrash->isChecked());
     confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
 
-    KConfigGroup scriptExecutionGroup(kioConfig, "Executable scripts");
+    KConfigGroup scriptExecutionGroup(kioConfig, QStringLiteral("Executable scripts"));
     const int index = m_confirmScriptExecution->currentIndex();
     switch (index) {
     case ScriptExecution::AlwaysAsk:
@@ -162,12 +162,12 @@ void ConfirmationsSettingsPage::restoreDefaults()
 void ConfirmationsSettingsPage::loadSettings()
 {
     KSharedConfig::Ptr kioConfig = KSharedConfig::openConfig(QStringLiteral("kiorc"), KConfig::IncludeGlobals);
-    const KConfigGroup confirmationGroup(kioConfig, "Confirmations");
+    const KConfigGroup confirmationGroup(kioConfig, QStringLiteral("Confirmations"));
     m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", ConfirmTrash));
     m_confirmEmptyTrash->setChecked(confirmationGroup.readEntry("ConfirmEmptyTrash", ConfirmEmptyTrash));
     m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", ConfirmDelete));
 
-    const KConfigGroup scriptExecutionGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), "Executable scripts");
+    const KConfigGroup scriptExecutionGroup(KSharedConfig::openConfig(QStringLiteral("kiorc")), QStringLiteral("Executable scripts"));
     const QString value = scriptExecutionGroup.readEntry("behaviourOnLaunch", "alwaysAsk");
     if (value == QLatin1String("alwaysAsk")) {
         m_confirmScriptExecution->setCurrentIndex(ScriptExecution::AlwaysAsk);

diff --git a/src/settings/interface/folderstabssettingspage.cpp b/src/settings/interface/folderstabssettingspage.cpp
index 85a0e8e132d3886d1f6f35cc5142c0fb998ce8ba..029d304939e6831da8b0d20f45737641fc4fb290 100644 (file)
--- a/src/settings/interface/folderstabssettingspage.cpp
+++ b/src/settings/interface/folderstabssettingspage.cpp
@@ -174,7 +174,7 @@ void FoldersTabsSettingsPage::applySettings()
 
     // Remove saved state if "remember open tabs" has been turned off
     if (!m_rememberOpenedTabsRadioButton->isChecked()) {
-        KConfigGroup windowState{KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "WindowState"};
+        KConfigGroup windowState{KSharedConfig::openConfig(QStringLiteral("dolphinrc")), QStringLiteral("WindowState")};
         if (windowState.exists()) {
             windowState.deleteGroup();
         }

diff --git a/src/settings/viewmodes/viewmodesettings.cpp b/src/settings/viewmodes/viewmodesettings.cpp
index 504ec12e7eb9117d25dda0f512fd5b8952f8f7e6..1644cc074a2713f52e2bfa468e480835c6a73a7e 100644 (file)
--- a/src/settings/viewmodes/viewmodesettings.cpp
+++ b/src/settings/viewmodes/viewmodesettings.cpp
@@ -24,7 +24,7 @@ ViewModeSettings::ViewModeSettings()
     KSharedConfig::Ptr config = KSharedConfig::openConfig();
     // Migrate old config entries
     if (GeneralSettings::version() < 202) {
-        for (const char *groupName : {"CompactMode", "DetailsMode", "IconsMode"}) {
+        for (const QString &groupName : {QStringLiteral("CompactMode"), QStringLiteral("DetailsMode"), QStringLiteral("IconsMode")}) {
             KConfigGroup group = config->group(groupName);
             const QString family = group.readEntry("FontFamily", QString{});
             if (family.isEmpty()) {

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index c630f8113d61312b69623d0258f99ba262ac7540..37c3d539b3bd305d6d980f76730a5f68ba6a4f22 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -209,7 +209,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView *dolphinView)
         applyButton->setEnabled(isDirty);
     });
 
-    const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "ViewPropertiesDialog");
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), QStringLiteral("ViewPropertiesDialog"));
     KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
 
     loadSettings();
@@ -221,7 +221,7 @@ ViewPropertiesDialog::~ViewPropertiesDialog()
     delete m_viewProps;
     m_viewProps = nullptr;
 
-    KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "ViewPropertiesDialog");
+    KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), QStringLiteral("ViewPropertiesDialog"));
     KWindowConfig::saveWindowSize(windowHandle(), dialogConfig);
 }
 

diff --git a/src/trash/dolphintrash.cpp b/src/trash/dolphintrash.cpp
index dd71135a52b166cd980d904d2cde73b6cd1df188..0bb61ff28cdc5c044417e6ef3c3479f1406ccadb 100644 (file)
--- a/src/trash/dolphintrash.cpp
+++ b/src/trash/dolphintrash.cpp
@@ -64,7 +64,7 @@ void Trash::empty(QWidget *window)
 bool Trash::isEmpty()
 {
     KConfig trashConfig(QStringLiteral("trashrc"), KConfig::SimpleConfig);
-    return (trashConfig.group("Status").readEntry("Empty", true));
+    return (trashConfig.group(QStringLiteral("Status")).readEntry("Empty", true));
 }
 
 #include "moc_dolphintrash.cpp"

diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index 418c9bfe8d636c02d6f245040bb61ecf6e8d64cd..d31dc11bae7510ef3c54b6aacef0ae834cabeb3c 100644 (file)
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -93,7 +93,7 @@ void DolphinItemListView::readSettings()
     updateFont();
     updateGridSize();
 
-    const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
+    const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));
     setEnabledPlugins(globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins()));
     setLocalFileSizePreviewLimit(globalConfig.readEntry("MaximumSize", 0));
     endTransaction();

diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index a3007523cd492a73da3c9d092dccb1fb113aaefa..c9e973987af482610e6b181fe4d2e12e10a8fefe 100644 (file)
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -198,8 +198,8 @@ void DolphinRemoteEncoding::slotDefault()
             qCDebug(DolphinDebug) << "Domain to remove: " << *it;
             if (config.hasGroup(*it)) {
                 config.deleteGroup(*it);
-            } else if (config.group("").hasKey(*it)) {
-                config.group("").deleteEntry(*it); //don't know what group name is supposed to be XXX
+            } else if (config.group(QString()).hasKey(*it)) {
+                config.group(QString()).deleteEntry(*it); // don't know what group name is supposed to be XXX
             }
         }
     }