diff --git a/plasma/applet.cpp b/plasma/applet.cpp index 52dce9dac..55bdb7dc3 100644 --- a/plasma/applet.cpp +++ b/plasma/applet.cpp @@ -931,16 +931,6 @@ bool Applet::hasValidAssociatedApplication() const return AssociatedApplicationManager::self()->appletHasValidAssociatedApplication(this); } -void Applet::setCustomCategories(const QStringList &categories) -{ - AppletPrivate::s_customCategories = QSet::fromList(categories); -} - -QStringList Applet::customCategories() const -{ - return AppletPrivate::s_customCategories.toList(); -} - Applet *Applet::loadPlasmoid(const QString &path, uint appletId, const QVariantList &args) { if (QFile::exists(path + "/metadata.desktop")) { diff --git a/plasma/applet.h b/plasma/applet.h index f94b05522..83a1406a4 100644 --- a/plasma/applet.h +++ b/plasma/applet.h @@ -267,20 +267,6 @@ class PLASMA_EXPORT Applet : public QObject */ void setTitle(const QString &title) const; - /** - * Sets the list of custom categories that are used in addition to the default - * set of categories known to libplasma for Applets. - * @param categories a list of categories - * @since 4.3 - */ - void setCustomCategories(const QStringList &categories); - - /** - * @return the list of custom categories known to libplasma - * @since 4.3 - */ - QStringList customCategories() const; - /** * Attempts to load an applet from a package * diff --git a/plasma/pluginloader.cpp b/plasma/pluginloader.cpp index 1493d2a5c..a5c6862ce 100644 --- a/plasma/pluginloader.cpp +++ b/plasma/pluginloader.cpp @@ -499,6 +499,16 @@ QStringList PluginLoader::listAppletCategories(const QString &parentApp, bool vi return categories; } +void PluginLoader::setCustomAppletCategories(const QStringList &categories) +{ + AppletPrivate::s_customCategories = QSet::fromList(categories); +} + +QStringList PluginLoader::customAppletCategories() const +{ + return AppletPrivate::s_customCategories.toList(); +} + KPluginInfo::List PluginLoader::listDataEngineInfo(const QString &parentApp) { diff --git a/plasma/pluginloader.h b/plasma/pluginloader.h index 9b28bf01a..4536a4ac4 100644 --- a/plasma/pluginloader.h +++ b/plasma/pluginloader.h @@ -164,6 +164,20 @@ public: QStringList listAppletCategories(const QString &parentApp = QString(), bool visibleOnly = true); + /** + * Sets the list of custom categories that are used in addition to the default + * set of categories known to libplasma for Applets. + * @param categories a list of categories + * @since 4.3 + */ + void setCustomAppletCategories(const QStringList &categories); + + /** + * @return the list of custom categories known to libplasma + * @since 4.3 + */ + QStringList customAppletCategories() const; + /** * Returns a list of all known DataEngines. *