port from KStandardDirs to QStandardPaths

REVIEW: 120498
This commit is contained in:
Michal Humpula
2014-10-05 12:04:29 +02:00
parent cc85a5243c
commit 15d09f9161
11 changed files with 41 additions and 46 deletions

View File

@@ -29,7 +29,6 @@
#include <KConfig>
#include <KConfigGroup>
#include <KGlobal>
#include <KStandardDirs>
// Konsole
#include "ShellCommand.h"
@@ -42,8 +41,8 @@ static const char GENERAL_GROUP[] = "General";
QString KDE4ProfileWriter::getPath(const Profile::Ptr profile)
{
// both location have trailing slash
static const QString localDataLocation = KGlobal::dirs()->saveLocation("data", "konsole/");
static const QString systemDataLocation = KStandardDirs::installPath("data") + "konsole/";
static const QString localDataLocation = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("konsole/");
static const QString systemDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).last() + QStringLiteral("konsole/");
const QString candidateLocalPath = localDataLocation + profile->untranslatedName() + ".profile";
QString newPath;