Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 10:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: adjust to KDesktopFileActions changes

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-13 06:19:46 +03:00
parent b364dfb73e
commit 0c0e446cb1
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dolphin/src/settings/services/servicessettingspage.cpp
View file

@ -189,10 +189,10 @@ void ServicesSettingsPage::loadServices()
const KService::List entries = KServiceTypeTrader::self()->query("KonqPopupMenu/Plugin");
foreach (const KSharedPtr<KService>& service, entries) {
const QString file = KStandardDirs::locate("services", service->entryPath());
const QList<KServiceAction> serviceActions =
KDesktopFileActions::userDefinedServices(file, true);
KDesktopFile desktopFile(file);
const QList<KServiceAction> serviceActions =
KDesktopFileActions::userDefinedServices(desktopFile, true);
const QString subMenuName = desktopFile.desktopGroup().readEntry("X-KDE-Submenu");
foreach (const KServiceAction& action, serviceActions) {

5
plasma/runners/solid/solidrunner.cpp
View file

@ -108,7 +108,7 @@ QList<QAction*> 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<KServiceAction> kserviceactions = KDesktopFileActions::userDefinedServices(solidaction, true);
const QList<KServiceAction> 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<KServiceAction> kserviceactions = KDesktopFileActions::userDefinedServices(actionfilepath, true);
const KDesktopFile kdestopfile(actionfilepath);
const QList<KServiceAction> kserviceactions = KDesktopFileActions::userDefinedServices(kdestopfile, true);
foreach (const KServiceAction &kserviceaction, kserviceactions) {
if (kserviceaction.name() == actionname) {
const Solid::Device soliddevice(kSolidUDI(match.id()));

2
soliduiserver/soliduiserver.cpp
View file

@ -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<Solid::Block>();
if (solidblock) {