Commit b454aa3c authored by Ahmad Samir's avatar Ahmad Samir Committed by David Edmundson
Browse files

KXftConfig: port from KGlobal::dirs to QStandardPaths

Drive-by changes: less implicit casting from ASCII
parent d45e5b23
...@@ -34,10 +34,9 @@ ...@@ -34,10 +34,9 @@
#include <QX11Info> #include <QX11Info>
#include <QByteArray> #include <QByteArray>
#include <QDebug> #include <QDebug>
#include <QStandardPaths>
#include <KLocalizedString> #include <KLocalizedString>
#include <KGlobal>
#include <KStandardDirs>
#include <fontconfig/fontconfig.h> #include <fontconfig/fontconfig.h>
...@@ -214,14 +213,15 @@ QString KXftConfig::getConfigFile() ...@@ -214,14 +213,15 @@ QString KXftConfig::getConfigFile()
return localFiles.front(); // Just return the 1st one... return localFiles.front(); // Just return the 1st one...
} else { // Hmmm... no known localFiles? } else { // Hmmm... no known localFiles?
if (FcGetVersion() >= 21000) { if (FcGetVersion() >= 21000) {
QString targetPath(KGlobal::dirs()->localxdgconfdir() + "fontconfig"); const QString targetPath(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation)
+ QLatin1Char('/') + QLatin1String("fontconfig"));
QDir target(targetPath); QDir target(targetPath);
if (!target.exists()) { if (!target.exists()) {
target.mkpath(targetPath); target.mkpath(targetPath);
} }
return targetPath + "/fonts.conf"; return targetPath + QLatin1String("/fonts.conf");
} else { } else {
return home + "/.fonts.conf"; return home + QLatin1String("/.fonts.conf");
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment