Merge remote-tracking branch 'origin/Applications/19.08'

kmail-refresh-settings/refreshsettingscleanuppage.cpp

@@ -49,10 +49,23 @@ void RefreshSettingsCleanupPage::cleanSettings()
         initCleanupFolderSettings(configName);
         initCleanupFiltersSettings(configName);
         initCleanDialogSettings(configName);
+        removeTipOfDay(configName);
     }
     Q_EMIT cleanUpDone();
 }
 
+void RefreshSettingsCleanupPage::removeTipOfDay(const QString &configName)
+{
+    KSharedConfigPtr settingsrc = KSharedConfig::openConfig(configName);
+
+    const QString tipOfDayStr = QStringLiteral("TipOfDay");
+    if (settingsrc->hasGroup(tipOfDayStr)) {
+        settingsrc->deleteGroup(tipOfDayStr);
+    }
+    settingsrc->sync();
+    Q_EMIT cleanDoneInfo(i18n("Remove obsolete \"TipOfDay\" settings: Done"));
+}
+
 void RefreshSettingsCleanupPage::initCleanDialogSettings(const QString &configName)
 {
     KSharedConfigPtr settingsrc = KSharedConfig::openConfig(configName);

kmail-refresh-settings/refreshsettingscleanuppage.h

@@ -40,6 +40,7 @@ private:
     void initCleanupFolderSettings(const QString &configName);
     void initCleanupFiltersSettings(const QString &configName);
     void initCleanDialogSettings(const QString &configName);
+    void removeTipOfDay(const QString &configName);
 };
 
 #endif // REFRESHSETTINGSCLEANUPPAGE_H