From 6a09781a3b99bbca2b2c66ee3041208a02ead0ca Mon Sep 17 00:00:00 2001
From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Wed, 1 Oct 2014 12:34:49 +0200
Subject: Ported Dolphin away from KStandardDirs

removed unused mirroredDirectory method

REVIEW: 120194
---
 src/settings/services/servicessettingspage.cpp | 4 ++--
 src/settings/viewpropertiesdialog.cpp          | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/settings')

diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index be43ae656..e4f5b3fab 100644
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -32,7 +32,7 @@
 #include <KNS3/Button>
 #include <KService>
 #include <KServiceTypeTrader>
-#include <KStandardDirs>
+#include <QStandardPaths>
 
 #include <settings/serviceitemdelegate.h>
 #include <settings/servicemodel.h>
@@ -195,7 +195,7 @@ void ServicesSettingsPage::loadServices()
     // Load generic services
     const KService::List entries = KServiceTypeTrader::self()->query("KonqPopupMenu/Plugin");
     foreach (const KService::Ptr& service, entries) {
-        const QString file = KStandardDirs::locate("services", service->entryPath());
+        const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kservices5/" % service->entryPath());
         const QList<KServiceAction> serviceActions =
                                     KDesktopFileActions::userDefinedServices(file, true);
 
diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 41a39f2a7..576154f2b 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -34,7 +34,6 @@
 #include <KIconLoader>
 #include <KIO/NetAccess>
 #include <KMessageBox>
-#include <KStandardDirs>
 #include <KUrl>
 #include <KComboBox>
 
-- 
cgit v1.3