From: Nathaniel Graham <pointedstick@zoho.com>
Date: Thu, 16 Nov 2017 14:23:46 +0000 (-0700)
Subject: Use KConfig::readEntry()'s default argument properly
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e60e3f07cf00823efdde3855cda0dfce36e74c52?ds=sidebyside

Use KConfig::readEntry()'s default argument properly

Summary: Follow-on patch to D7440 to use KConfig::readEntry()'s default argument properly to reduce some unnecessary code

Test Plan: Tested in KDE Neon. no regressions; by default, all plugins are enabled if the key is not set, and if it is set, user changes to the list are remembered

Reviewers: #dolphin, elvisangelaccio, dfaure, apol

Reviewed By: #dolphin, elvisangelaccio, apol

Differential Revision: https://phabricator.kde.org/D8846
---

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 8ea106a5e..11d01b2cf 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -99,10 +99,7 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO
     Q_ASSERT(model);
 
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
-    m_enabledPlugins = globalConfig.readEntry("Plugins", QStringList());
-    if (m_enabledPlugins.isEmpty()) {
-        m_enabledPlugins = KIO::PreviewJob::defaultPlugins();
-    }
+    m_enabledPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());
 
     connect(m_model, &KFileItemModel::itemsInserted,
             this,    &KFileItemModelRolesUpdater::slotItemsInserted);
diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index ed0d9bd77..b88977af5 100644
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -174,10 +174,8 @@ void PreviewsSettingsPage::loadPreviewPlugins()
 void PreviewsSettingsPage::loadSettings()
 {
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), QStringLiteral("PreviewSettings"));
-    m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", QStringList());
-    if (m_enabledPreviewPlugins.isEmpty()) {
-        m_enabledPreviewPlugins = KIO::PreviewJob::defaultPlugins();
-    }
+    m_enabledPreviewPlugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());
+
     const qulonglong defaultRemotePreview = static_cast<qulonglong>(MaxRemotePreviewSize) * 1024 * 1024;
     const qulonglong maxRemoteByteSize = globalConfig.readEntry("MaximumRemoteSize", defaultRemotePreview);
     const int maxRemoteMByteSize = maxRemoteByteSize / (1024 * 1024);
diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index d73889fd5..a1472c661 100644
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -95,11 +95,7 @@ void DolphinItemListView::readSettings()
     updateGridSize();
 
     const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
-    QStringList enabledPlugins = globalConfig.readEntry("Plugins", QStringList());
-    if (enabledPlugins.isEmpty()) {
-        enabledPlugins = KIO::PreviewJob::defaultPlugins();
-    }
-    setEnabledPlugins(enabledPlugins);
+    setEnabledPlugins(globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins()));
 
     endTransaction();
 }