diff --git a/kpart/scripting/scriptengine.cpp b/kpart/scripting/scriptengine.cpp index a773751ef..bbcf285f5 100644 --- a/kpart/scripting/scriptengine.cpp +++ b/kpart/scripting/scriptengine.cpp @@ -93,7 +93,7 @@ QScriptValue ScriptEngine::knownWidgetTypes(QScriptContext *context, QScriptEngi Q_UNUSED(engine) QStringList widgets; - KPluginInfo::List infos = Plasma::Applet::listAppletInfo(); + KPluginInfo::List infos = PluginLoader::self()->listAppletInfo(); foreach (const KPluginInfo &info, infos) { widgets.append(info.pluginName()); diff --git a/plasma/applet.cpp b/plasma/applet.cpp index 4b1dfa6f6..2d9c91836 100644 --- a/plasma/applet.cpp +++ b/plasma/applet.cpp @@ -931,11 +931,6 @@ bool Applet::hasValidAssociatedApplication() const return AssociatedApplicationManager::self()->appletHasValidAssociatedApplication(this); } -KPluginInfo::List Applet::listAppletInfo(const QString &category, const QString &parentApp) -{ - return PluginLoader::self()->listAppletInfo(category, parentApp); -} - KPluginInfo::List Applet::listAppletInfoForMimeType(const QString &mimeType) { QString constraint = AppletPrivate::parentAppConstraint(); diff --git a/plasma/applet.h b/plasma/applet.h index 8e92aff53..21137711f 100644 --- a/plasma/applet.h +++ b/plasma/applet.h @@ -267,26 +267,6 @@ class PLASMA_EXPORT Applet : public QObject */ void setTitle(const QString &title) const; - /** - * Returns a list of all known applets. - * This may skip applets based on security settings and ExcludeCategories in the application's config. - * - * @param category Only applets matching this category will be returned. - * Useful in conjunction with knownCategories. - * If "Misc" is passed in, then applets without a - * Categories= entry are also returned. - * If an empty string is passed in, all applets are - * returned. - * @param parentApp the application to filter applets on. Uses the - * X-KDE-ParentApp entry (if any) in the plugin info. - * The default value of QString() will result in a - * list containing only applets not specifically - * registered to an application. - * @return list of applets - **/ - static KPluginInfo::List listAppletInfo(const QString &category = QString(), - const QString &parentApp = QString()); - /** * Returns a list of all known applets associated with a certain mimetype. *