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.
wilder-5.24
Nicolas Fella 4 years ago
parent 41e9c0e65f
commit ca8f42fe95
  1. 31
      libtaskmanager/tasktools.cpp
  2. 3
      libtaskmanager/tasktools.h
  3. 24
      shell/scripting/scriptengine_v1.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("");

@ -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.
**/

@ -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;

Loading…
Cancel
Save