From 0c0e446cb14601d0a99ac9e22d54f0b91dc68536 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 13 May 2024 06:19:46 +0300 Subject: [PATCH] generic: adjust to KDesktopFileActions changes Signed-off-by: Ivailo Monev --- dolphin/src/settings/services/servicessettingspage.cpp | 6 +++--- plasma/runners/solid/solidrunner.cpp | 5 +++-- soliduiserver/soliduiserver.cpp | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dolphin/src/settings/services/servicessettingspage.cpp b/dolphin/src/settings/services/servicessettingspage.cpp index a26f6b0f..51845994 100644 --- a/dolphin/src/settings/services/servicessettingspage.cpp +++ b/dolphin/src/settings/services/servicessettingspage.cpp @@ -189,10 +189,10 @@ void ServicesSettingsPage::loadServices() const KService::List entries = KServiceTypeTrader::self()->query("KonqPopupMenu/Plugin"); foreach (const KSharedPtr& service, entries) { const QString file = KStandardDirs::locate("services", service->entryPath()); - const QList serviceActions = - KDesktopFileActions::userDefinedServices(file, true); - KDesktopFile desktopFile(file); + const QList serviceActions = + KDesktopFileActions::userDefinedServices(desktopFile, true); + const QString subMenuName = desktopFile.desktopGroup().readEntry("X-KDE-Submenu"); foreach (const KServiceAction& action, serviceActions) { diff --git a/plasma/runners/solid/solidrunner.cpp b/plasma/runners/solid/solidrunner.cpp index 333ddd8f..8fa3f4a9 100644 --- a/plasma/runners/solid/solidrunner.cpp +++ b/plasma/runners/solid/solidrunner.cpp @@ -108,7 +108,7 @@ QList SolidRunner::actionsForMatch(const Plasma::QueryMatch &match) const QString solidpredicatestring = kconfiggroup.readEntry("X-KDE-Solid-Predicate"); const Solid::Predicate solidpredicate = Solid::Predicate::fromString(solidpredicatestring); if (solidpredicate.matches(soliddevice)) { - const QList kserviceactions = KDesktopFileActions::userDefinedServices(solidaction, true); + const QList kserviceactions = KDesktopFileActions::userDefinedServices(kdestopfile, true); foreach (const KServiceAction &kserviceaction, kserviceactions) { const QString actionname = kserviceaction.name(); if (actionname.contains(s_actionidseparator)) { @@ -218,7 +218,8 @@ void SolidRunner::run(const Plasma::QueryMatch &match) } const QString actionname = actionid.mid(0, actionseparatorindex); const QString actionfilepath = actionid.mid(actionseparatorindex + 1, actionid.size() - actionseparatorindex - 1); - const QList kserviceactions = KDesktopFileActions::userDefinedServices(actionfilepath, true); + const KDesktopFile kdestopfile(actionfilepath); + const QList kserviceactions = KDesktopFileActions::userDefinedServices(kdestopfile, true); foreach (const KServiceAction &kserviceaction, kserviceactions) { if (kserviceaction.name() == actionname) { const Solid::Device soliddevice(kSolidUDI(match.id())); diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp index 77fcebdb..750b6e8f 100644 --- a/soliduiserver/soliduiserver.cpp +++ b/soliduiserver/soliduiserver.cpp @@ -67,7 +67,7 @@ static SolidUiActions kSolidDeviceActions() if (solidpredicate.matches(soliddevice)) { SolidUiAction solidactionstruct; solidactionstruct.device = soliddevice; - solidactionstruct.actions = KDesktopFileActions::userDefinedServices(solidaction, true); + solidactionstruct.actions = KDesktopFileActions::userDefinedServices(kdestopfile, true); solidactionstruct.when = solidwhenlist; const Solid::Block* solidblock = soliddevice.as(); if (solidblock) {