From 5b111cc46712e1894e1eae51ed2e359d39e4040f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Tue, 7 Jul 2015 08:28:38 +0200
Subject: [PATCH] [tabbox] Locate layouts through KPackage instead of KService

Another usage of ksycoca gone.
---
 tabbox/autotests/CMakeLists.txt |  2 ++
 tabbox/tabboxhandler.cpp        | 37 ++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/tabbox/autotests/CMakeLists.txt b/tabbox/autotests/CMakeLists.txt
index 4089801b2d..8d6d14c908 100644
--- a/tabbox/autotests/CMakeLists.txt
+++ b/tabbox/autotests/CMakeLists.txt
@@ -21,6 +21,7 @@ target_link_libraries( testTabBoxClientModel
     Qt5::Test
     Qt5::X11Extras
     KF5::I18n
+    KF5::Package
     KF5::Service
     KF5::WindowSystem
     XCB::XCB
@@ -49,6 +50,7 @@ target_link_libraries( testTabBoxHandler
     Qt5::Test
     Qt5::X11Extras
     KF5::I18n
+    KF5::Package
     KF5::Service
     KF5::WindowSystem
     XCB::XCB
diff --git a/tabbox/tabboxhandler.cpp b/tabbox/tabboxhandler.cpp
index 0a43314cae..30ea7608dd 100644
--- a/tabbox/tabboxhandler.cpp
+++ b/tabbox/tabboxhandler.cpp
@@ -45,7 +45,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // KDE
 #include <KLocalizedString>
 #include <KProcess>
-#include <KServiceTypeTrader>
+#include <KPackage/Package>
+#include <KPackage/PackageLoader>
 
 namespace KWin
 {
@@ -243,34 +244,40 @@ QObject *TabBoxHandlerPrivate::createSwitcherItem(bool desktopMode)
                                               .arg(config.layoutName())
                                               .arg(desktopMode ? QStringLiteral("desktopswitcher/DesktopSwitcher.qml") : QStringLiteral("windowswitcher/WindowSwitcher.qml")));
     if (file.isNull()) {
-        auto findSwitcher = [this, desktopMode] {
-            QString constraint = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(config.layoutName());
+        const QString folderName = QStringLiteral(KWIN_NAME) + (desktopMode ? QStringLiteral("/desktoptabbox/") : QStringLiteral("/tabbox/"));
+        auto findSwitcher = [this, desktopMode, folderName] {
             const QString type = desktopMode ? QStringLiteral("KWin/DesktopSwitcher") : QStringLiteral("KWin/WindowSwitcher");
-            KService::List offers = KServiceTypeTrader::self()->query(type, constraint);
+            auto offers = KPackage::PackageLoader::self()->findPackages(type,  folderName,
+                [this] (const KPluginMetaData &data) {
+                    return data.pluginId().compare(config.layoutName(), Qt::CaseInsensitive) == 0;
+                }
+            );
             if (offers.isEmpty()) {
                 // load default
-                constraint = QStringLiteral("[X-KDE-PluginInfo-Name] == '%1'").arg(QStringLiteral("informative"));
-                offers = KServiceTypeTrader::self()->query(type, constraint);
+                auto offers = KPackage::PackageLoader::self()->findPackages(type,  folderName,
+                    [this] (const KPluginMetaData &data) {
+                        return data.pluginId().compare(QStringLiteral("informative"), Qt::CaseInsensitive) == 0;
+                    }
+                );
                 if (offers.isEmpty()) {
                     qDebug() << "could not find default window switcher layout";
-                    return KService::Ptr();
+                    return KPluginMetaData();
                 }
             }
             return offers.first();
         };
-        KService::Ptr service = findSwitcher();
-        if (!service) {
+        auto service = findSwitcher();
+        if (!service.isValid()) {
             return nullptr;
         }
-        if (service->property(QStringLiteral("X-Plasma-API")).toString() != QStringLiteral("declarativeappletscript")) {
+        if (service.value(QStringLiteral("X-Plasma-API")) != QStringLiteral("declarativeappletscript")) {
             qDebug() << "Window Switcher Layout is no declarativeappletscript";
             return nullptr;
         }
-        auto findScriptFile = [desktopMode, service] {
-            const QString pluginName = service->property(QStringLiteral("X-KDE-PluginInfo-Name")).toString();
-            const QString scriptName = service->property(QStringLiteral("X-Plasma-MainScript")).toString();
-            const QString type = desktopMode ? QStringLiteral("/desktoptabbox/") : QStringLiteral("/tabbox/");
-            return QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral(KWIN_NAME) + type + pluginName + QStringLiteral("/contents/") + scriptName);
+        auto findScriptFile = [desktopMode, service, folderName] {
+            const QString pluginName = service.pluginId();
+            const QString scriptName = service.value(QStringLiteral("X-Plasma-MainScript"));
+            return QStandardPaths::locate(QStandardPaths::GenericDataLocation, folderName + pluginName + QStringLiteral("/contents/") + scriptName);
         };
         file = findScriptFile();
     }