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

make PackageStructure plugins use the json method as with DataEngines

Browse Source
This commit is contained in:
Aaron Seigo 2014-08-29 12:19:08 +02:00
parent aa99a4f15c
commit cd87344d80
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plasma/packagestructure.h
View File

@ -27,6 +27,7 @@
#include <plasma/plasma.h>
#include <plasma/plasma_export.h>
#include <plasma/package.h>
#include <plasma/version.h>
namespace Plasma
{
@ -98,5 +99,9 @@ private:
#define K_EXPORT_PLASMA_PACKAGE(libname, classname) \
K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
#endif
#define K_EXPORT_PLASMA_PACKAGE_WITH_JSON(classname, jsonFile) \
K_PLUGIN_FACTORY_WITH_JSON(factory, jsonFile, registerPlugin<classname>();) \
K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
#endif

21
src/plasma/pluginloader.cpp
View File

@ -53,6 +53,7 @@ public:
PluginLoaderPrivate()
: isDefaultLoader(false),
dataEnginePluginDir("plasma/dataengine"),
packageStructurePluginDir("plasma/packagestructure"),
packageRE("[^a-zA-Z0-9\\-_]")
{
}
@ -64,6 +65,7 @@ public:
QHash<QString, QWeakPointer<PackageStructure> > structures;
bool isDefaultLoader;
QString dataEnginePluginDir;
QString packageStructurePluginDir;
QRegExp packageRE;
};
@ -443,23 +445,16 @@ Package PluginLoader::loadPackage(const QString &packageFormat, const QString &s
}
// first we check for plugins in sycoca
QString constraint = QString("[X-KDE-PluginInfo-Name] == '%1'").arg(packageFormat);
KService::List offers = KServiceTypeTrader::self()->query("Plasma/PackageStructure", constraint);
QVariantList args;
QString error;
foreach (const KService::Ptr &offer, offers) {
structure = qobject_cast<PackageStructure *>(offer->createInstance<PackageStructure>(0, args, &error));
if (structure) {
d->structures.insert(hashkey, structure);
return Package(structure);
}
const QString constraint = QString("[X-KDE-PluginInfo-Name] == '%1'").arg(packageFormat);
structure = KPluginTrader::createInstanceFromQuery<Plasma::PackageStructure>(d->packageStructurePluginDir, "Plasma/PackageStructure", constraint, 0);
if (structure) {
d->structures.insert(hashkey, structure);
return Package(structure);
}
#ifndef NDEBUG
// qDebug() << "Couldn't load Package for" << packageFormat << "! reason given: " << error;
#endif
}
return Package();
}