[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra] /: Stage, Flow, Braindump: Add calligra 2 -> 3 migration
From:       Dag Andersen <danders () get2net ! dk>
Date:       2016-12-07 11:31:28
Message-ID: E1cEaRc-0002ZG-Kc () code ! kde ! org
[Download RAW message or body]

Git commit 255b301aa2b1f062df72bebff7dbfed4322cd28d by Dag Andersen.
Committed on 07/12/2016 at 11:30.
Pushed by danders into branch 'master'.

Stage, Flow, Braindump: Add calligra 2 -> 3 migration

M  +8    -0    braindump/src/main.cpp
M  +6    -0    flow/part/main.cpp
M  +6    -0    stage/app/main.cpp

https://commits.kde.org/calligra/255b301aa2b1f062df72bebff7dbfed4322cd28d

diff --git a/braindump/src/main.cpp b/braindump/src/main.cpp
index e9b3880bf43..5fd3fb49c9a 100644
--- a/braindump/src/main.cpp
+++ b/braindump/src/main.cpp
@@ -30,6 +30,8 @@
 #include "RootSection.h"
 #include "SectionsIO.h"
 
+#include <Calligra2Migration.h>
+
 int main(int argc, char **argv)
 {
     /**
@@ -46,6 +48,12 @@ int main(int argc, char **argv)
 
     QApplication app(argc, argv);
 
+    // Migrate data from kde4 to kf5 locations
+    Calligra2Migration m("braindump");
+    m.setConfigFiles(QStringList() << QStringLiteral("braindumprc"));
+    m.setUiFiles(QStringList() << QStringLiteral("braindumpview.rc"));
+    m.migrate();
+
     KAboutData about = newBrainDumpAboutData();
     KAboutData::setApplicationData(about);
 
diff --git a/flow/part/main.cpp b/flow/part/main.cpp
index 257d9b42f83..dd4f8c35a10 100644
--- a/flow/part/main.cpp
+++ b/flow/part/main.cpp
@@ -36,6 +36,12 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
 
   KoApplication app(FLOW_MIME_TYPE);
 
+  // Migrate data from kde4 to kf5 locations
+  Calligra2Migration m("flow");
+  m.setConfigFiles(QStringList() << QStringLiteral("flowrc"));
+  m.setUiFiles(QStringList() << QStringLiteral("flow.rc"));
+  m.migrate();
+
   if (!app.start())
       return 1;
   app.exec();
diff --git a/stage/app/main.cpp b/stage/app/main.cpp
index c05e0217f64..8251a1ec8c0 100644
--- a/stage/app/main.cpp
+++ b/stage/app/main.cpp
@@ -44,6 +44,12 @@ extern "C" STAGE_EXPORT int kdemain( int argc, char **argv )
 
     delete aboutData;
 
+    // Migrate data from kde4 to kf5 locations
+    Calligra2Migration m("calligrastage", "stage");
+    m.setConfigFiles(QStringList() << QStringLiteral("stagerc"));
+    m.setUiFiles(QStringList() << QStringLiteral("stage.rc") << QStringLiteral("stage_readonly.rc"));
+    m.migrate();
+
     if (!app.start()) {
         return 1;
     }
[prev in list] [next in list] [prev in thread] [next in thread]