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

List:       kde-commits
Subject:    [granatier] src/config: AppDataLocation got added in Qt5.4 -> replace with DataLocation
From:       Mathias Kraus <k.hias () gmx ! de>
Date:       2015-03-01 21:43:13
Message-ID: E1YSBdp-0007Pr-TB () scm ! kde ! org
[Download RAW message or body]

Git commit dbe9393f46e411842f59c5d375242afd3c0e13bd by Mathias Kraus.
Committed on 01/03/2015 at 21:35.
Pushed by mkraus into branch 'master'.

AppDataLocation got added in Qt5.4 -> replace with DataLocation

M  +3    -3    src/config/arenaselector.cpp
M  +1    -1    src/config/playerselector.cpp
M  +1    -1    src/config/playersettings.cpp

http://commits.kde.org/granatier/dbe9393f46e411842f59c5d375242afd3c0e13bd

diff --git a/src/config/arenaselector.cpp b/src/config/arenaselector.cpp
index 73cc35b..a0603c5 100644
--- a/src/config/arenaselector.cpp
+++ b/src/config/arenaselector.cpp
@@ -101,7 +101,7 @@ void ArenaSelector::showEvent(QShowEvent*)
 ArenaSelector::Private::Private(ArenaSelector* parent, Options options) : q(parent), \
m_options(options), m_arena(NULL), m_graphicsScene(NULL), m_svgScaleFactor(1)  {
     KgTheme* theme = new KgTheme(QByteArray());
-    theme->setGraphicsPath(QStandardPaths::locate(QStandardPaths::AppDataLocation, \
QString("themes/granatier.svgz"))); +    \
theme->setGraphicsPath(QStandardPaths::locate(QStandardPaths::DataLocation, \
QString("themes/granatier.svgz")));  m_renderer = new KGameRenderer(theme);
 }
 
@@ -169,7 +169,7 @@ void ArenaSelector::Private::findArenas(const QString \
&initialSelection)  ui.arenaList->setSortingEnabled(true);
 
     QStringList arenasAvailable;
-    const QStringList dirs = \
QStandardPaths::locateAll(QStandardPaths::AppDataLocation, "arenas", \
QStandardPaths::LocateDirectory); +    const QStringList dirs = \
QStandardPaths::locateAll(QStandardPaths::DataLocation, "arenas", \
QStandardPaths::LocateDirectory);  Q_FOREACH (const QString& dir, dirs) {
          const QStringList fileNames = QDir(dir).entryList(QStringList() << \
QStringLiteral("*.desktop"));  Q_FOREACH (const QString& file, fileNames) {
@@ -478,7 +478,7 @@ void ArenaSelector::Private::_k_openKNewStuffDialog()
 void ArenaSelector::Private::_k_importArenasDialog()
 {
     // get local directory for arenas
-    const QString arenaDir = \
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + \
QStringLiteral("/arenas/"); +    const QString arenaDir = \
QStandardPaths::writableLocation(QStandardPaths::DataLocation) + \
QStringLiteral("/arenas/");  // create path if it does not exist
     if(!QDir(arenaDir).exists()) QDir().mkpath(arenaDir);
 
diff --git a/src/config/playerselector.cpp b/src/config/playerselector.cpp
index cf1e061..7ebfa34 100644
--- a/src/config/playerselector.cpp
+++ b/src/config/playerselector.cpp
@@ -124,7 +124,7 @@ void PlayerSelector::Private::fillList()
         
         playerSelectorItem = new PlayerSelectorItem(playerIDs[i], m_playerSettings, \
m_list);  
-        renderer.load(QStandardPaths::locate(QStandardPaths::AppDataLocation, \
QStringLiteral("players/%1").arg(m_playerSettings->playerGraphicsFile(playerIDs[i]))));
 +        renderer.load(QStandardPaths::locate(QStandardPaths::DataLocation, \
QStringLiteral("players/%1").arg(m_playerSettings->playerGraphicsFile(playerIDs[i]))));
  renderer.render(&pixPainter, "player_0");
         playerSelectorItem->setPlayerPreviewPixmap(pixmap);
         
diff --git a/src/config/playersettings.cpp b/src/config/playersettings.cpp
index 2578b38..955ee02 100644
--- a/src/config/playersettings.cpp
+++ b/src/config/playersettings.cpp
@@ -29,7 +29,7 @@ PlayerSettings::PlayerSettings()
     QStringList playerFilesAvailable;
     QStringList playerNamesAvailable;
 
-    const QStringList dirs = \
QStandardPaths::locateAll(QStandardPaths::AppDataLocation, "players", \
QStandardPaths::LocateDirectory); +    const QStringList dirs = \
QStandardPaths::locateAll(QStandardPaths::DataLocation, "players", \
QStandardPaths::LocateDirectory);  Q_FOREACH (const QString& dir, dirs) {
          const QStringList fileNames = QDir(dir).entryList(QStringList() << \
QStringLiteral("*.desktop"));  Q_FOREACH (const QString& file, fileNames) {


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