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

slightly clearer code

Browse Source
This commit is contained in:
Aaron Seigo 2011-12-07 14:02:44 +01:00
parent 5190b061d1
commit a9c3cb256a
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
abstracttoolbox.cpp
View File

@ -58,22 +58,19 @@ AbstractToolBox::~AbstractToolBox()
AbstractToolBox *AbstractToolBox::load(const QString &name, const QVariantList &args, Plasma::Containment *containment) AbstractToolBox *AbstractToolBox::load(const QString &name, const QVariantList &args, Plasma::Containment *containment)
{ {
const QString constraint = QString("[X-KDE-PluginInfo-Name] == '%1'").arg(name); const QString constraint = name.isEmpty() ? QString() : QString("[X-KDE-PluginInfo-Name] == '%1'").arg(name);
KService::List offers = KServiceTypeTrader::self()->query("Plasma/ToolBox", constraint); KService::List offers = KServiceTypeTrader::self()->query("Plasma/ToolBox", constraint);
if (!offers.isEmpty()) { if (!offers.isEmpty()) {
KService::Ptr offer = offers.first(); KService::Ptr offer = offers.first();
KPluginLoader plugin(*offer); KPluginLoader plugin(*offer);
if (Plasma::isPluginVersionCompatible(plugin.pluginVersion())) {
if (!Plasma::isPluginVersionCompatible(plugin.pluginVersion())) { return offer->createInstance<AbstractToolBox>(containment, args);
return 0;
} }
return offer->createInstance<AbstractToolBox>(containment, args);
} else {
return 0;
} }
return 0;
} }
KPluginInfo::List AbstractToolBox::listToolBoxInfo(const QString KPluginInfo::List AbstractToolBox::listToolBoxInfo(const QString