From a9c3cb256ace6ae50f9da145bb24458f5289774c Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Wed, 7 Dec 2011 14:02:44 +0100 Subject: [PATCH] slightly clearer code --- abstracttoolbox.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/abstracttoolbox.cpp b/abstracttoolbox.cpp index b3df4ee2e..818d2b09b 100644 --- a/abstracttoolbox.cpp +++ b/abstracttoolbox.cpp @@ -58,22 +58,19 @@ AbstractToolBox::~AbstractToolBox() 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); if (!offers.isEmpty()) { KService::Ptr offer = offers.first(); KPluginLoader plugin(*offer); - - if (!Plasma::isPluginVersionCompatible(plugin.pluginVersion())) { - return 0; + if (Plasma::isPluginVersionCompatible(plugin.pluginVersion())) { + return offer->createInstance(containment, args); } - - return offer->createInstance(containment, args); - } else { - return 0; } + + return 0; } KPluginInfo::List AbstractToolBox::listToolBoxInfo(const QString