From ca8f42fe95ec52dcd222a473950cdb310416db7e Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Mon, 20 Dec 2021 01:23:40 +0100
Subject: [PATCH] Remove dead code for querying preferred service

The code tries to read files from /usr/share/kcm_componentchooser, however I can't find anything referencing these kinds of files.
---
 libtaskmanager/tasktools.cpp        | 31 -----------------------------
 libtaskmanager/tasktools.h          |  3 ---
 shell/scripting/scriptengine_v1.cpp | 24 ----------------------
 3 files changed, 58 deletions(-)

diff --git a/libtaskmanager/tasktools.cpp b/libtaskmanager/tasktools.cpp
index 168459561..581299434 100644
--- a/libtaskmanager/tasktools.cpp
+++ b/libtaskmanager/tasktools.cpp
@@ -621,37 +621,6 @@ QString defaultApplication(const QUrl &url)
         }
     } else if (KService::Ptr service = KApplicationTrader::preferredService(application)) {
         return service->storageId();
-    } else {
-        // Try the files in share/apps/kcm_componentchooser/*.desktop.
-        const QStringList directories =
-            QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kcm_componentchooser"), QStandardPaths::LocateDirectory);
-        QStringList services;
-
-        for (const QString &directory : directories) {
-            QDir dir(directory);
-            const QStringList desktopFiles = dir.entryList(QStringList("*.desktop"));
-            for (const QString &f : desktopFiles)
-                services += dir.absoluteFilePath(f);
-        }
-
-        for (const QString &service : qAsConst(services)) {
-            KConfig config(service, KConfig::SimpleConfig);
-            KConfigGroup cg = config.group(QByteArray());
-            const QString type = cg.readEntry("valueName", QString());
-
-            if (type.compare(application, Qt::CaseInsensitive) == 0) {
-                KConfig store(cg.readPathEntry("storeInFile", QStringLiteral("null")));
-                KConfigGroup storeCg(&store, cg.readEntry("valueSection", QString()));
-                const QString exec =
-                    storeCg.readPathEntry(cg.readEntry("valueName", "kcm_componenchooser_null"), cg.readEntry("defaultImplementation", QString()));
-
-                if (!exec.isEmpty()) {
-                    return exec;
-                }
-
-                break;
-            }
-        }
     }
 
     return QLatin1String("");
diff --git a/libtaskmanager/tasktools.h b/libtaskmanager/tasktools.h
index 3a4e76920..67d051156 100644
--- a/libtaskmanager/tasktools.h
+++ b/libtaskmanager/tasktools.h
@@ -128,9 +128,6 @@ servicesFromCmdLine(const QString &cmdLine, const QString &processName, KSharedC
  * - "terminal"
  * - "filemanager"
  *
- * If the host component matches none of the above, an attempt is made
- * to match to application links stored in kcm_componentchooser/.
- *
  * @param url A URL using the preferred:// scheme.
  * @returns an application id for the given URL.
  **/
diff --git a/shell/scripting/scriptengine_v1.cpp b/shell/scripting/scriptengine_v1.cpp
index d1ca6bb10..f0cf918ea 100644
--- a/shell/scripting/scriptengine_v1.cpp
+++ b/shell/scripting/scriptengine_v1.cpp
@@ -676,30 +676,6 @@ QJSValue ScriptEngine::V1::defaultApplication(const QString &application, bool s
     } else if (KService::Ptr service = KApplicationTrader::preferredService(application)) {
         return storageId ? service->storageId() : onlyExec(service->exec());
 
-    } else {
-        // try the files in share/apps/kcm_componentchooser/
-        const QStringList services = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kcm_componentchooser/"));
-        qDebug() << "ok, trying in" << services;
-        foreach (const QString &service, services) {
-            if (!service.endsWith(QLatin1String(".desktop"))) {
-                continue;
-            }
-            KConfig config(service, KConfig::SimpleConfig);
-            KConfigGroup cg = config.group(QByteArray());
-            const QString type = cg.readEntry("valueName", QString());
-            // qDebug() << "    checking" << service << type << application;
-            if (matches(type, application)) {
-                KConfig store(cg.readPathEntry("storeInFile", QStringLiteral("null")));
-                KConfigGroup storeCg(&store, cg.readEntry("valueSection", QString()));
-                const QString exec =
-                    storeCg.readPathEntry(cg.readEntry("valueName", "kcm_componenchooser_null"), cg.readEntry("defaultImplementation", QString()));
-                if (!exec.isEmpty()) {
-                    return exec;
-                }
-
-                break;
-            }
-        }
     }
 
     return false;