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

List:       kde-commits
Subject:    [picmi] src: Port KGlobal to QStandardPaths
From:       Jakob Gruber <jakob.gruber () gmail ! com>
Date:       2015-07-15 13:42:39
Message-ID: E1ZFMxL-0006mw-VU () scm ! kde ! org
[Download RAW message or body]

Git commit 6f391f3330cb2c0d765a3d2f80f1e4d1bdeb0dc3 by Jakob Gruber.
Committed on 15/07/2015 at 09:23.
Pushed by gruber into branch 'master'.

Port KGlobal to QStandardPaths

M  +4    -3    src/gui/renderer.cpp
M  +5    -3    src/logic/levelloader.cpp

http://commits.kde.org/picmi/6f391f3330cb2c0d765a3d2f80f1e4d1bdeb0dc3

diff --git a/src/gui/renderer.cpp b/src/gui/renderer.cpp
index 4bddad5..83beab6 100644
--- a/src/gui/renderer.cpp
+++ b/src/gui/renderer.cpp
@@ -23,10 +23,9 @@
 #include <QFile>
 #include <QPainter>
 #include <QPixmapCache>
+#include <QStandardPaths>
 #include <assert.h>
 #include <iostream>
-#include <kglobal.h>
-#include <kstandarddirs.h>
 
 #include "src/constants.h"
 #include "src/outofboundsexception.h"
@@ -60,7 +59,9 @@ void Renderer::loadResources() {
     QList<QString> paths;
     paths << QString(prefix)
           << QString(FILEPATH "/" + prefix)
-          << KGlobal::dirs()->findResourceDir("appdata", prefix) + prefix;
+          << QStandardPaths::locate(QStandardPaths::DataLocation,
+                                    prefix,
+                                    QStandardPaths::LocateOption::LocateDirectory) + prefix;
 
     /* try loading first from working directory, then the system directories */
     for (int i = 0; i < paths.size(); i++) {
diff --git a/src/logic/levelloader.cpp b/src/logic/levelloader.cpp
index 5cc9bb5..bbac56e 100644
--- a/src/logic/levelloader.cpp
+++ b/src/logic/levelloader.cpp
@@ -19,13 +19,13 @@
 #include "config.h"
 #include "levelloader.h"
 
+#include <KLocalizedString>
 #include <QDebug>
 #include <QDir>
 #include <QDomDocument>
 #include <QFile>
 #include <QSettings>
-#include <kglobal.h>
-#include <kstandarddirs.h>
+#include <QStandardPaths>
 
 #include "src/systemexception.h"
 
@@ -137,7 +137,9 @@ QList<QSharedPointer<Level> > LevelLoader::load() {
     QList<QString> paths;
     paths << QString(prefix)
           << QString(FILEPATH "/" + prefix)
-          << KGlobal::dirs()->findResourceDir("appdata", prefix) + prefix;
+          << QStandardPaths::locate(QStandardPaths::DataLocation,
+                                    prefix,
+                                    QStandardPaths::LocateOption::LocateDirectory) + prefix;
 
     LevelList list;
 

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