From 065be2aff8eb9e5f36f0b288bbbd250de81ae200 Mon Sep 17 00:00:00 2001
From: Cyril Rossi <cyril.rossi@enioka.com>
Date: Thu, 5 Nov 2020 10:53:14 +0100
Subject: [PATCH] KCM Activities port to KCModuleData to highlight default at
 module level

Fix default value for ResourceScoringEnabled in kcfg file.
Must be set to true because what-to-remember default is AllApplication.
---
 kcms/activities/CMakeLists.txt                  | 8 ++++++++
 kcms/activities/MainConfigurationWidget.cpp     | 3 ++-
 kcms/activities/PrivacyTab.h                    | 1 -
 kcms/activities/kactivitymanagerd_settings.kcfg | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/kcms/activities/CMakeLists.txt b/kcms/activities/CMakeLists.txt
index a5d152858..f1c18914b 100644
--- a/kcms/activities/CMakeLists.txt
+++ b/kcms/activities/CMakeLists.txt
@@ -49,6 +49,14 @@ qt5_add_dbus_interface (
    features_interface
    )
 
+kcmutils_generate_module_data(
+    KAMD_KCM_SRCS
+    MODULE_DATA_HEADER kactivitiesdata.h
+    MODULE_DATA_CLASS_NAME KActivitiesData
+    SETTINGS_HEADERS kactivitymanagerd_settings.h kactivitymanagerd_plugins_settings.h
+    SETTINGS_CLASSES KActivityManagerdSettings KActivityManagerdPluginsSettings
+)
+
 kconfig_add_kcfg_files(KAMD_KCM_SRCS kactivitymanagerd_settings.kcfgc GENERATE_MOC)
 kconfig_add_kcfg_files(KAMD_KCM_SRCS kactivitymanagerd_plugins_settings.kcfgc GENERATE_MOC)
 
diff --git a/kcms/activities/MainConfigurationWidget.cpp b/kcms/activities/MainConfigurationWidget.cpp
index 23b3e80ca..8c14b204f 100644
--- a/kcms/activities/MainConfigurationWidget.cpp
+++ b/kcms/activities/MainConfigurationWidget.cpp
@@ -27,8 +27,9 @@
 #include "ActivitiesTab.h"
 #include "SwitchingTab.h"
 #include "PrivacyTab.h"
+#include "kactivitiesdata.h"
 
-K_PLUGIN_FACTORY(ActivitiesKCMFactory, registerPlugin<MainConfigurationWidget>();)
+K_PLUGIN_FACTORY(ActivitiesKCMFactory, registerPlugin<MainConfigurationWidget>(); registerPlugin<KActivitiesData>();)
 
 class MainConfigurationWidget::Private : public Ui::MainConfigurationWidgetBase {
 public:
diff --git a/kcms/activities/PrivacyTab.h b/kcms/activities/PrivacyTab.h
index f7b379ef3..e95f89bf6 100644
--- a/kcms/activities/PrivacyTab.h
+++ b/kcms/activities/PrivacyTab.h
@@ -36,7 +36,6 @@ public:
     explicit PrivacyTab(QWidget *parent);
     ~PrivacyTab() override;
 
-    bool isDefault();
     KCoreConfigSkeleton *pluginConfig();
     
 public Q_SLOTS:
diff --git a/kcms/activities/kactivitymanagerd_settings.kcfg b/kcms/activities/kactivitymanagerd_settings.kcfg
index 2e64fa72c..6eba0bfc1 100644
--- a/kcms/activities/kactivitymanagerd_settings.kcfg
+++ b/kcms/activities/kactivitymanagerd_settings.kcfg
@@ -10,7 +10,7 @@
        <default>false</default>
      </entry>
      <entry name="resourceScoringEnabled" key="org.kde.ActivityManager.ResourceScoringEnabled" type="Bool">
-        <default>false</default>
+        <default>true</default>
      </entry>
    </group>
 </kcfg>
-- 
GitLab