From 70300427c626edcdfb8db60e2bec2d32187f9fd7 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 22 May 2016 23:41:58 +0000 Subject: [PATCH] kparts: deal with TODO in plugin info Signed-off-by: Ivailo Monev --- kparts/plugin.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kparts/plugin.cpp b/kparts/plugin.cpp index 94baac43..36292ad1 100644 --- a/kparts/plugin.cpp +++ b/kparts/plugin.cpp @@ -89,17 +89,13 @@ QList Plugin::pluginInfos(const KComponentData &componentDat QList plugins; - // TODO KDE5: change * into *.rc and remove test for .desktop from the for loop below. const QStringList pluginDocs = componentData.dirs()->findAllResources( - "data", componentData.componentName()+"/kpartplugins/*", KStandardDirs::Recursive ); + "data", componentData.componentName()+"/kpartplugins/*.rc", KStandardDirs::Recursive ); QMap sortedPlugins; const QStringList dummy; foreach ( const QString pIt, pluginDocs ) { - if ( pIt.endsWith(QLatin1String( ".desktop" ) ) ) - continue; - QFileInfo fInfo( pIt ); QMap::Iterator mapIt = sortedPlugins.find( fInfo.fileName() ); if ( mapIt == sortedPlugins.end() )