From 098996857661a85303b6b0286f27bbd1a57bfef4 Mon Sep 17 00:00:00 2001
From: Akira Ohgaki <akiraohgaki@gmail.com>
Date: Wed, 12 Oct 2016 23:09:02 +0900
Subject: [PATCH] Change kdeDataHomePath() method to kdehomePath() and it's
return $KDEHOME
---
src/handlers/xdgurl.cpp | 2 +-
src/utility/file.cpp | 5 ++---
src/utility/file.h | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/handlers/xdgurl.cpp b/src/handlers/xdgurl.cpp
index db744f3..0b924c5 100644
--- a/src/handlers/xdgurl.cpp
+++ b/src/handlers/xdgurl.cpp
@@ -88,7 +88,7 @@ QString XdgUrl::_convertPathString(const QString &path)
newPath.replace("$XDG_DATA", Utility::File::xdgDataHomePath());
}
else if (newPath.contains("$KDE_DATA")) {
- newPath.replace("$KDE_DATA", Utility::File::kdeDataHomePath());
+ newPath.replace("$KDE_DATA", Utility::File::kdehomePath());
}
return newPath;
diff --git a/src/utility/file.cpp b/src/utility/file.cpp
index 854ed82..2330ba1 100644
--- a/src/utility/file.cpp
+++ b/src/utility/file.cpp
@@ -63,14 +63,13 @@ QString File::xdgCacheHomePath()
* https://userbase.kde.org/KDE_System_Administration/Environment_Variables
*/
-QString File::kdeDataHomePath()
+QString File::kdehomePath()
{
- // KDE 4
+ // KDE 4 maybe uses $KDEHOME
QString path = QString::fromLocal8Bit(qgetenv("KDEHOME").constData());
if (path.isEmpty()) {
path = homePath() + "/.kde";
}
- path += "/share";
return path;
}
diff --git a/src/utility/file.h b/src/utility/file.h
index 0623580..8700250 100644
--- a/src/utility/file.h
+++ b/src/utility/file.h
@@ -21,7 +21,7 @@ public:
static QString xdgDataHomePath();
static QString xdgConfigHomePath();
static QString xdgCacheHomePath();
- static QString kdeDataHomePath();
+ static QString kdehomePath();
static QFileInfoList readDir(const QString &path);
static bool makeDir(const QString &path);
static QString readText(const QString &path);
--
GitLab