From 4e8f41c1090e59f8ba3dfb9ec0555534a815c122 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 8 Feb 2013 11:41:31 +0100
Subject: [PATCH] port away some kstandarddirs

---
 kpart/scripting/scriptengine.cpp | 5 +++--
 plasma/dataengine.cpp            | 5 +++--
 shell/CMakeLists.txt             | 3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/kpart/scripting/scriptengine.cpp b/kpart/scripting/scriptengine.cpp
index df4edf067..a773751ef 100644
--- a/kpart/scripting/scriptengine.cpp
+++ b/kpart/scripting/scriptengine.cpp
@@ -26,7 +26,6 @@
 #include <kdeversion.h>
 #include <KServiceTypeTrader>
 #include <KShell>
-#include <KStandardDirs>
 
 #include <Plasma/Applet>
 #include <Plasma/Containment>
@@ -144,7 +143,9 @@ QScriptValue ScriptEngine::loadTemplate(QScriptContext *context, QScriptEngine *
 
     Plasma::PackageStructure::Ptr structure(new LayoutTemplatePackageStructure);
     KPluginInfo info(offers.first());
-    const QString path = KStandardDirs::locate("data", structure->defaultPackageRoot() + '/' + info.pluginName() + '/');
+    const QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+                                                structure->defaultPackageRoot() + '/' + info.pluginName() + '/',
+                                                QStandardPaths::LocateDirectory);
     if (path.isEmpty()) {
         kDebug() << "script path is empty";
         return false;
diff --git a/plasma/dataengine.cpp b/plasma/dataengine.cpp
index 7e3a89dd2..ae771e71f 100644
--- a/plasma/dataengine.cpp
+++ b/plasma/dataengine.cpp
@@ -514,8 +514,9 @@ DataEnginePrivate::DataEnginePrivate(DataEngine *e, const KPluginInfo &info)
 
         if (!api.isEmpty()) {
             const QString path =
-                KStandardDirs::locate("data",
-                                      "plasma/dataengines/" + dataEngineDescription.pluginName() + '/');
+                QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+                                       "plasma/dataengines/" + dataEngineDescription.pluginName() + '/',
+                                       QStandardPaths::LocateDirectory);
             package = new Package(PluginLoader::self()->loadPackage("Plasma/DataEngine", api));
             package->setPath(path);
 
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index 95bad3fff..31b51d0d5 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -44,7 +44,8 @@ target_link_libraries(testplasma2
  ${Qt5Qml_LIBRARIES}
  ${kcoreaddons}
  ${KDE4_KDEUI_LIBS}
- ${KDE4_KDECORE_LIBS} 
+ #${KDE4_KDECORE_LIBS}
+ kdecore
  plasma
 )