alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Port PluginLoader from KStandardDirs to QStandardPaths

Browse Source
This commit is contained in:
Sebastian Kügler 2013-07-10 03:27:19 +02:00
parent 0822e4cb9e
commit d56bf246de
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plasma/pluginloader.cpp
View File

@ -19,10 +19,11 @@
#include "pluginloader.h" #include "pluginloader.h"
#include <QStandardPaths>
#include <kdebug.h> #include <kdebug.h>
#include <kservice.h> #include <kservice.h>
#include <kservicetypetrader.h> #include <kservicetypetrader.h>
#include <kstandarddirs.h>
#include <kglobal.h> #include <kglobal.h>
#include <kplugininfo.h> #include <kplugininfo.h>
@ -818,7 +819,9 @@ KPluginInfo::List PluginLoader::internalContainmentActionsInfo() const
static KPluginInfo::List standardInternalInfo(const QString &type, const QString &category = QString()) static KPluginInfo::List standardInternalInfo(const QString &type, const QString &category = QString())
{ {
QStringList files = KGlobal::dirs()->findAllResources("appdata", "plasma/internal/" + type + "/*.desktop", KStandardDirs::NoDuplicates); QStringList files = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
"plasma/internal/" + type + "/*.desktop",
QStandardPaths::LocateFile);
KPluginInfo::List allInfo = KPluginInfo::fromFiles(files); KPluginInfo::List allInfo = KPluginInfo::fromFiles(files);