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

List:       kde-commits
Subject:    [calligra] karbon: Karbon: Migrate from kde4 locations to kf5 locations
From:       Dag Andersen <danders () get2net ! dk>
Date:       2016-11-30 13:39:23
Message-ID: E1cC56Z-0006d0-K4 () code ! kde ! org
[Download RAW message or body]

Git commit f3caf60cd30aa9fbb2376ec10a23a6b4df06075c by Dag Andersen.
Committed on 30/11/2016 at 13:39.
Pushed by danders into branch 'master'.

Karbon: Migrate from kde4 locations to kf5 locations

Summary: Please check if all files have been included in migration

Test Plan:
Tested migration quite well with plan
Cursory test with karbon

Reviewers: anthonyfieroni

Reviewed By: anthonyfieroni

Tags: #kexi, #calligra:_3.0

Differential Revision: https://phabricator.kde.org/D3487

M  +7    -0    karbon/main.cpp

https://commits.kde.org/calligra/f3caf60cd30aa9fbb2376ec10a23a6b4df06075c

diff --git a/karbon/main.cpp b/karbon/main.cpp
index 2fa3f4d..616a68a 100644
--- a/karbon/main.cpp
+++ b/karbon/main.cpp
@@ -32,6 +32,7 @@
 #include <QLoggingCategory>
 =

 #include <KoApplication.h>
+#include <Calligra2Migration.h>
 =

 #include <KarbonFactory.h>
 #include <KarbonDocument.h>
@@ -71,6 +72,12 @@ extern "C" KARBONUI_EXPORT int kdemain( int argc, char* =
argv[] )
 =

     delete aboutData;
 =

+    // Migrate data from kde4 to kf5 locations
+    Calligra2Migration m("karbon");
+    m.setConfigFiles(QStringList() << QStringLiteral("karbonrc"));
+    m.setUiFiles(QStringList() << QStringLiteral("karbon.rc")<< QStringLit=
eral("karbon_readonly.rc"));
+    m.migrate();
+
     if (!app.start()) {  // parses command line args, create initial docs =
and mainwindows
         return 1;
     }
[prev in list] [next in list] [prev in thread] [next in thread]