mirror of
https://invent.kde.org/system/dolphin
synced 2024-07-04 17:30:55 +00:00
Remove deprecated KServiceTypeTrader
This commit is contained in:
parent
d0fd5e3869
commit
c2ef0392e9
|
@ -152,7 +152,6 @@ endif()
|
||||||
ecm_set_disabled_deprecation_versions(
|
ecm_set_disabled_deprecation_versions(
|
||||||
QT 5.15
|
QT 5.15
|
||||||
KF 5.90
|
KF 5.90
|
||||||
KSERVICE 5.89 # We use KServiceTypeTrader in a compat code path
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
#include <KMessageBox>
|
#include <KMessageBox>
|
||||||
#include <KPluginMetaData>
|
#include <KPluginMetaData>
|
||||||
#include <KService>
|
#include <KService>
|
||||||
#include <KServiceTypeTrader>
|
|
||||||
#include <kio_version.h>
|
#include <kio_version.h>
|
||||||
#include <kiocore_export.h>
|
#include <kiocore_export.h>
|
||||||
#include <kservice_export.h>
|
#include <kservice_export.h>
|
||||||
|
@ -282,13 +281,6 @@ void ContextMenuSettingsPage::loadServices()
|
||||||
const auto locations = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio/servicemenus"), QStandardPaths::LocateDirectory);
|
const auto locations = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio/servicemenus"), QStandardPaths::LocateDirectory);
|
||||||
QStringList files = KFileUtils::findAllUniqueFiles(locations);
|
QStringList files = KFileUtils::findAllUniqueFiles(locations);
|
||||||
|
|
||||||
#if KIOWIDGETS_BUILD_DEPRECATED_SINCE(5, 90)
|
|
||||||
const KService::List services = KServiceTypeTrader::self()->query(QStringLiteral("KonqPopupMenu/Plugin"));
|
|
||||||
for (const KService::Ptr &service : services) {
|
|
||||||
files << QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kservices5/" % service->entryPath());
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for (const auto &file : qAsConst(files)) {
|
for (const auto &file : qAsConst(files)) {
|
||||||
const QList<KServiceAction> serviceActions = KDesktopFileActions::userDefinedServices(KService(file), true);
|
const QList<KServiceAction> serviceActions = KDesktopFileActions::userDefinedServices(KService(file), true);
|
||||||
|
|
||||||
|
@ -307,18 +299,6 @@ void ContextMenuSettingsPage::loadServices()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load service plugins, this is deprecated in KIO 5.82
|
|
||||||
#if KIOCORE_BUILD_DEPRECATED_SINCE(5, 82)
|
|
||||||
const KService::List pluginServices = KServiceTypeTrader::self()->query(QStringLiteral("KFileItemAction/Plugin"));
|
|
||||||
for (const KService::Ptr &service : pluginServices) {
|
|
||||||
const QString desktopEntryName = service->desktopEntryName();
|
|
||||||
if (!isInServicesList(desktopEntryName)) {
|
|
||||||
const bool checked = showGroup.readEntry(desktopEntryName, true);
|
|
||||||
addRow(service->icon(), service->name(), desktopEntryName, checked);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Load JSON-based plugins that implement the KFileItemActionPlugin interface
|
// Load JSON-based plugins that implement the KFileItemActionPlugin interface
|
||||||
const auto jsonPlugins = KPluginMetaData::findPlugins(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kfileitemaction"));
|
const auto jsonPlugins = KPluginMetaData::findPlugins(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kfileitemaction"));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user