diff --git a/kio/kio/kdesktopfileactions.cpp b/kio/kio/kdesktopfileactions.cpp index 0643fcf8..351ae8c4 100644 --- a/kio/kio/kdesktopfileactions.cpp +++ b/kio/kio/kdesktopfileactions.cpp @@ -182,12 +182,11 @@ QList KDesktopFileActions::builtinServices( const KUrl& _url ) QList KDesktopFileActions::userDefinedServices( const QString& path, bool bLocalFiles ) { KDesktopFile cfg( path ); - return userDefinedServices( path, cfg, bLocalFiles ); + return userDefinedServices( cfg, bLocalFiles ); } -QList KDesktopFileActions::userDefinedServices( const QString& path, const KDesktopFile& cfg, bool bLocalFiles, const KUrl::List & file_list ) +QList KDesktopFileActions::userDefinedServices( const KDesktopFile& cfg, bool bLocalFiles, const KUrl::List & file_list ) { - Q_UNUSED(path); // this was just for debugging; we use service.entryPath() now. KService service(&cfg); return userDefinedServices(service, bLocalFiles, file_list); } diff --git a/kio/kio/kdesktopfileactions.h b/kio/kio/kdesktopfileactions.h index 23c927e8..cb0fc8c1 100644 --- a/kio/kio/kdesktopfileactions.h +++ b/kio/kio/kdesktopfileactions.h @@ -56,7 +56,7 @@ namespace KDesktopFileActions * This allows for the menu to be changed depending on the exact files via * the X-KDE-GetActionMenu extension. */ - KIO_EXPORT QList userDefinedServices( const QString& path, const KDesktopFile& desktopFile, bool bLocalFiles, const KUrl::List & file_list = KUrl::List()); + KIO_EXPORT QList userDefinedServices( const KDesktopFile& desktopFile, bool bLocalFiles, const KUrl::List & file_list = KUrl::List()); /** * Returns a list of services defined by the user as possible actions diff --git a/kio/kio/kfileitemactions.cpp b/kio/kio/kfileitemactions.cpp index 29418154..09259906 100644 --- a/kio/kio/kfileitemactions.cpp +++ b/kio/kio/kfileitemactions.cpp @@ -213,7 +213,7 @@ int KFileItemActions::addServiceActionsTo(QMenu* mainMenu) } #endif ServiceList& list = s.selectList(priority, submenuName); - list = KDesktopFileActions::userDefinedServices(path, desktopFile, true /*isLocal*/); + list = KDesktopFileActions::userDefinedServices(desktopFile, true /*isLocal*/); } // 2 - Look for "servicemenus" bindings (user-defined services) @@ -228,7 +228,7 @@ int KFileItemActions::addServiceActionsTo(QMenu* mainMenu) const QString priority = cfg.readEntry("X-KDE-Priority"); const QString submenuName = cfg.readEntry("X-KDE-Submenu"); ServiceList& list = s.selectList(priority, submenuName); - list += KDesktopFileActions::userDefinedServices(dotDirectoryFile, desktopFile, true); + list += KDesktopFileActions::userDefinedServices(desktopFile, true); } }