From: Elvis Angelaccio Date: Sun, 5 Feb 2017 22:38:32 +0000 (+0100) Subject: Drop another obsolete version check X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/5f484d8ee865554f933dd22fd1a2e597b1ecb52a Drop another obsolete version check We now require Frameworks >= 5.30 --- diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index bedb4cb80..58e2f4de5 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -487,76 +486,7 @@ void DolphinContextMenu::addServiceActions(KFileItemActions& fileItemActions) void DolphinContextMenu::addFileItemPluginActions(KFileItemActions& fileItemActions) { -#if KIO_VERSION >= QT_VERSION_CHECK(5, 27, 0) fileItemActions.addPluginActionsTo(this); -#else - Q_UNUSED(fileItemActions); - KFileItemListProperties props; - if (m_selectedItems.isEmpty()) { - props.setItems(KFileItemList() << baseFileItem()); - } else { - props = selectedItemsProperties(); - } - - QString commonMimeType = props.mimeType(); - if (commonMimeType.isEmpty()) { - commonMimeType = QStringLiteral("application/octet-stream"); - } - - const KService::List pluginServices = KMimeTypeTrader::self()->query(commonMimeType, QStringLiteral("KFileItemAction/Plugin"), QStringLiteral("exist Library")); - const KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals); - const KConfigGroup showGroup = config.group("Show"); - - QSet addedPlugins; - foreach (const KService::Ptr& service, pluginServices) { - if (!showGroup.readEntry(service->desktopEntryName(), true)) { - // The plugin has been disabled - continue; - } - - KAbstractFileItemActionPlugin* abstractPlugin = service->createInstance(); - if (abstractPlugin) { - abstractPlugin->setParent(this); - addActions(abstractPlugin->actions(props, m_mainWindow)); - addedPlugins << service->desktopEntryName(); - } - } - - const auto jsonPlugins = KPluginLoader::findPlugins(QStringLiteral("kf5/kfileitemaction"), [=](const KPluginMetaData& metaData) { - if (!metaData.serviceTypes().contains(QStringLiteral("KFileItemAction/Plugin"))) { - return false; - } - - auto mimeType = QMimeDatabase().mimeTypeForName(commonMimeType); - foreach (const auto& supportedMimeType, metaData.mimeTypes()) { - if (mimeType.inherits(supportedMimeType)) { - return true; - } - } - - return false; - }); - - foreach (const auto& jsonMetadata, jsonPlugins) { - // The plugin has been disabled - if (!showGroup.readEntry(jsonMetadata.pluginId(), true)) { - continue; - } - - // The plugin also has a .desktop file and has already been added. - if (addedPlugins.contains(jsonMetadata.pluginId())) { - continue; - } - - KPluginFactory *factory = KPluginLoader(jsonMetadata.fileName()).factory(); - KAbstractFileItemActionPlugin* abstractPlugin = factory->create(); - if (abstractPlugin) { - abstractPlugin->setParent(this); - addActions(abstractPlugin->actions(props, m_mainWindow)); - addedPlugins << jsonMetadata.pluginId(); - } - } -#endif } void DolphinContextMenu::addVersionControlPluginActions()