diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp index e462394e3..4791a54d2 100644 --- a/src/plasma/corona.cpp +++ b/src/plasma/corona.cpp @@ -213,16 +213,7 @@ QRegion Corona::availableScreenRegion(int id) const void Corona::loadDefaultLayout() { -} - -void Corona::setPreferredToolBoxPlugin(const Plasma::ContainmentType type, const QString &plugin) -{ - d->toolBoxPlugins[type] = plugin; -} - -QString Corona::preferredToolBoxPlugin(const Plasma::ContainmentType type) const -{ - return d->toolBoxPlugins.value(type); + //Default implementation does nothing } ImmutabilityType Corona::immutability() const diff --git a/src/plasma/corona.h b/src/plasma/corona.h index 9523375e9..b5077a25f 100644 --- a/src/plasma/corona.h +++ b/src/plasma/corona.h @@ -144,15 +144,6 @@ public: */ QHash defaultContainmentActionsPlugins(ContainmentType containmentType) const; - /** - * Returns the name of the preferred plugin to be used as containment toolboxes. - * CustomContainments and CustomPanelContainments can still override it as their liking. It's also not guaranteed that the plugin will actually exist. - * - * @param type the containment type of which we want to know the associated toolbox plugin - * @since 4.6 - */ - QString preferredToolBoxPlugin(const ContainmentType type) const; - /** * Imports an applet layout from a config file. The results will be added to the * current set of Containments. @@ -257,14 +248,6 @@ protected: **/ virtual void loadDefaultLayout(); - /** - * @return The preferred toolbox plugin name for a given containment type. - * @param type the containment type of which we want to know the preferred toolbox plugin. - * @param plugin the toolbox plugin name - * @since 4.6 - */ - void setPreferredToolBoxPlugin(const ContainmentType type, const QString &plugin); - private: CoronaPrivate *const d; diff --git a/src/plasma/private/corona_p.h b/src/plasma/private/corona_p.h index bf8ab4093..000322491 100644 --- a/src/plasma/private/corona_p.h +++ b/src/plasma/private/corona_p.h @@ -63,7 +63,6 @@ public: QHash offscreenWidgets; KActionCollection actions; QMap > containmentActionsDefaults; - QHash toolBoxPlugins; }; }