From 6f8472c60a2050e2601ef93ec62a59d826f50990 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 19 Nov 2014 15:24:38 +0000 Subject: [PATCH] changed standard directories --- kdecore/kernel/kstandarddirs.cpp | 16 ++++++++-------- kinit/kioslave.cpp | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp index e0b01438..ef2a499d 100644 --- a/kdecore/kernel/kstandarddirs.cpp +++ b/kdecore/kernel/kstandarddirs.cpp @@ -120,9 +120,9 @@ share/sounds locale share/locale services -share/kde4/services +share/katana/services servicetypes -share/kde4/servicetypes +share/katana/servicetypes mime share/mimelnk cgi @@ -134,9 +134,9 @@ share/templates exe bin module -%lib/kde4 +%lib/katana qtplugins -%lib/kde4/plugins +%lib/katana/plugins kcfg share/config.kcfg emoticons @@ -175,9 +175,9 @@ static const char types_string[] = "locale\0" "share/locale\0" "services\0" - "share/kde4/services\0" + "share/katana/services\0" "servicetypes\0" - "share/kde4/servicetypes\0" + "share/katana/servicetypes\0" "mime\0" "share/mimelnk\0" "cgi\0" @@ -189,9 +189,9 @@ static const char types_string[] = "exe\0" "bin\0" "module\0" - "%lib/kde4\0" + "%lib/katana\0" "qtplugins\0" - "%lib/kde4/plugins\0" + "%lib/katana/plugins\0" "kcfg\0" "share/config.kcfg\0" "emoticons\0" diff --git a/kinit/kioslave.cpp b/kinit/kioslave.cpp index 4c04abdf..cbfc709d 100644 --- a/kinit/kioslave.cpp +++ b/kinit/kioslave.cpp @@ -85,7 +85,7 @@ int main(int argc, char **argv) QString paths = QString::fromLocal8Bit(kdedirs); QStringList pathlist = paths.split(';'); Q_FOREACH(const QString &path, pathlist) { - QString slave_path = path + QLatin1String("/lib/kde4/") + QFileInfo(libpath).fileName(); + QString slave_path = path + QLatin1String("/lib/katana/") + QFileInfo(libpath).fileName(); qDebug("trying to load '%s'",slave_path.toLatin1().data()); lib.setFileName(slave_path); if (lib.load() && lib.isLoaded() )