Merge branch 'master' of git://anongit.kde.org/kdepim

CMakeLists.txt

@@ -193,6 +193,7 @@ if (KDEPIM_BUILD_DESKTOP)
      foldershortcutactionmanager.cpp
      kmlaunchexternalcomponent.cpp
      manageshowcollectionproperties.cpp
+     kmmigrateapplication.cpp
      ${kmailprivate_attributes_LIB_SRCS}
      ${kmailprivate_tag_LIB_SRCS}
      ${kmailprivate_job_LIB_SRCS}

kmail_part.cpp

@@ -47,6 +47,7 @@
 #include "foldertreeview.h"
 #include "tag/tagactionmanager.h"
 #include "foldershortcutactionmanager.h"
+#include "kmmigrateapplication.h"
 
 #include <KSharedConfig>
 
@@ -60,8 +61,8 @@ KMailPart::KMailPart(QWidget *parentWidget, QObject *parent, const QVariantList
 {
     setComponentName(QLatin1String("kmail2"), QLatin1String("kmail2"));
 
-    // Migrate to xdg path
-    KMail::migrateConfig();
+    KMMigrateApplication migrate;
+    migrate.migrate();
 
     // import i18n data and icons from libraries:
     KMail::insertLibraryCataloguesAndIcons();

kmmigrateapplication.cpp

@@ -0,0 +1,61 @@
+/*
+  Copyright (c) 2015 Montel Laurent <montel@kde.org>
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License, version 2, as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "kmmigrateapplication.h"
+
+#include <Kdelibs4ConfigMigrator>
+
+KMMigrateApplication::KMMigrateApplication()
+{
+    initializeMigrator();
+}
+
+void KMMigrateApplication::migrate()
+{
+    // Migrate to xdg.
+    Kdelibs4ConfigMigrator migrate(QLatin1String("kmail"));
+    migrate.setConfigFiles(QStringList() << QStringLiteral("kmail2rc") << QStringLiteral("kmail2.notifyrc") << QStringLiteral("kmailsnippetrc") << QStringLiteral("customtemplatesrc") << QStringLiteral("templatesconfigurationrc") << QStringLiteral("kpimcompletionorder") << QStringLiteral("messageviewer.notifyrc"));
+    migrate.setUiFiles(QStringList() << QStringLiteral("kmail_part.rc") << QStringLiteral("kmcomposerui.rc") <<  QStringLiteral("kmmainwin.rc") <<  QStringLiteral("kmreadermainwin.rc"));
+    migrate.migrate();
+
+    // Migrate folders and files.
+    if (mMigrator.checkIfNecessary()) {
+        mMigrator.start();
+    }
+}
+
+void KMMigrateApplication::initializeMigrator()
+{
+    mMigrator.setApplicationName(QStringLiteral("kmail2"));
+    mMigrator.setConfigFileName(QStringLiteral("kmail2rc"));
+    mMigrator.setCurrentConfigVersion(1);
+    // autostart
+    PimCommon::MigrateFileInfo migrateInfoAutoStart;
+    migrateInfoAutoStart.setFolder(true);
+    migrateInfoAutoStart.setType(QStringLiteral("apps"));
+    migrateInfoAutoStart.setPath(QStringLiteral("kmail2/autostart/"));
+    mMigrator.insertMigrateInfo(migrateInfoAutoStart);
+#if 0
+    //MessageViewer
+    PimCommon::MigrateFileInfo migrateInfoMessageViewer;
+    migrateInfoMessageViewer.setFolder(true);
+    migrateInfoAutoStart.setType(QStringLiteral("apps"));
+    migrateInfoAutoStart.setPath(QStringLiteral("kmail2/autostart/"));
+    mMigrator.insertMigrateInfo(migrateInfoAutoStart);
+#endif
+    //TODO add folder to migrate
+}

kmmigrateapplication.h

@@ -0,0 +1,34 @@
+/*
+  Copyright (c) 2015 Montel Laurent <montel@kde.org>
+
+  This program is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License, version 2, as
+  published by the Free Software Foundation.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along
+  with this program; if not, write to the Free Software Foundation, Inc.,
+  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef KMMIGRATEAPPLICATION_H
+#define KMMIGRATEAPPLICATION_H
+
+#include "pimcommon/migration/migrateapplicationfiles.h"
+#include "kmail_export.h"
+class KMAIL_EXPORT KMMigrateApplication
+{
+public:
+    KMMigrateApplication();
+
+    void migrate();
+private:
+    void initializeMigrator();
+    PimCommon::MigrateApplicationFiles mMigrator;
+};
+
+#endif // KMMIGRATEAPPLICATION_H

kmstartup.cpp

@@ -22,7 +22,6 @@
 
 #include <KLocalizedString>
 
-#include <kdelibs4configmigrator.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 
@@ -31,15 +30,6 @@
 namespace KMail
 {
 
-void migrateConfig()
-{
-    Kdelibs4ConfigMigrator migrate(QLatin1String("kmail"));
-    migrate.setConfigFiles(QStringList() << QLatin1String("kmail2rc") << QLatin1String("kmail2.notifyrc") << QLatin1String("kmailsnippetrc") << QLatin1String("customtemplatesrc") << QLatin1String("templatesconfigurationrc") << QLatin1String("kpimcompletionorder") << QLatin1String("messageviewer.notifyrc"));
-    migrate.setUiFiles(QStringList() << QLatin1String("kmail_part.rc") << QLatin1String("kmcomposerui.rc") <<  QLatin1String("kmmainwin.rc") <<  QLatin1String("kmreadermainwin.rc"));
-    //TODO migrate autosave too
-    migrate.migrate();
-}
-
 void checkConfigUpdates()
 {
     static const char *const updates[] = {
@@ -114,7 +104,6 @@ void insertLibraryCataloguesAndIcons()
         "akonadi_followupreminder_agent"
     };
 
-    KLocale *l = KLocale::global();
     KIconLoader *il = KIconLoader::global();
     unsigned int catalogSize = (sizeof catalogs / sizeof * catalogs);
     for (unsigned int i = 0 ; i < catalogSize ; ++i) {

kmstartup.h

@@ -24,7 +24,6 @@ namespace KMail
 {
 KMAIL_EXPORT void checkConfigUpdates();
 KMAIL_EXPORT void insertLibraryCataloguesAndIcons();
-KMAIL_EXPORT void migrateConfig();
 }
 
 #endif

main.cpp

@@ -23,6 +23,7 @@
 #include "kmkernel.h" //control center
 #include "kmmainwidget.h"
 #include "kmail_options.h"
+#include "kmmigrateapplication.h"
 
 #include "kmail_debug.h"
 #include <kmessagebox.h>
@@ -132,8 +133,8 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-    // Migrate to xdg path
-    KMail::migrateConfig();
+    KMMigrateApplication migrate;
+    migrate.migrate();
 
     // Qt doesn't treat the system tray as a window, and therefore Qt would quit
     // the event loop when an error message is clicked away while KMail is in the