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

List:       kde-commits
Subject:    [granatier/Applications/15.04] src: reparse configuration after migration to update config cache
From:       Mathias Kraus <k.hias () gmx ! de>
Date:       2015-03-21 15:58:10
Message-ID: E1YZLms-0001dz-Rc () scm ! kde ! org
[Download RAW message or body]

Git commit 5dd0cda3f9afb5dcdd41183329b98ff4686b9edd by Mathias Kraus.
Committed on 21/03/2015 at 15:55.
Pushed by mkraus into branch 'Applications/15.04'.

reparse configuration after migration to update config cache

M  +7    -3    src/main.cpp

http://commits.kde.org/granatier/5dd0cda3f9afb5dcdd41183329b98ff4686b9edd

diff --git a/src/main.cpp b/src/main.cpp
index 0399cce..84bb5e5 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -28,9 +28,12 @@
 #include <QStandardPaths>
 #include <QDir>
 #include <KDBusService>
+#include <KSharedConfig>
 
 int main(int argc, char** argv)
 {
+    QApplication app(argc, argv);
+
     Kdelibs4ConfigMigrator migrate(QStringLiteral("granatier"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("granatierrc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("granatierui.rc"));
@@ -39,7 +42,7 @@ int main(int argc, char** argv)
         // migrate old data
         Kdelibs4Migration dataMigrator;
         const QString sourceBasePath = dataMigrator.saveLocation("data", \
                "granatier");
-        const QString targetBasePath = \
QStandardPaths::writableLocation(QStandardPaths::DataLocation) + \
QStringLiteral("/granatier/"); +        const QString targetBasePath = \
QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1Char('/');  \
QString targetFilePath;  
         QStringList dataDirs;
@@ -63,9 +66,10 @@ int main(int argc, char** argv)
                 }
             }
         }
-    }
 
-    QApplication app(argc, argv);
+        // update the configuration cache
+        KSharedConfig::openConfig()->reparseConfiguration();
+    }
 
     app.setWindowIcon(QIcon::fromTheme(QLatin1String("granatier")));
 


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