diff --git a/src/plasma/containmentactions.cpp b/src/plasma/containmentactions.cpp index 673f44e4e..05c2d0763 100644 --- a/src/plasma/containmentactions.cpp +++ b/src/plasma/containmentactions.cpp @@ -35,7 +35,6 @@ #include #include -#include "dataengineconsumer.h" #include "version.h" namespace Plasma @@ -179,11 +178,6 @@ QList ContainmentActions::contextualActions() return QList(); } -DataEngine *ContainmentActions::dataEngine(const QString &name) const -{ - return d->dataEngine(name); -} - bool ContainmentActions::configurationRequired() const { return d->needsConfig; diff --git a/src/plasma/containmentactions.h b/src/plasma/containmentactions.h index b8dc359ef..055c91ca1 100644 --- a/src/plasma/containmentactions.h +++ b/src/plasma/containmentactions.h @@ -54,10 +54,6 @@ class ContainmentActionsPrivate; class PLASMA_EXPORT ContainmentActions : public QObject { Q_OBJECT - Q_PROPERTY(QString name READ name CONSTANT) - Q_PROPERTY(QString pluginName READ pluginName CONSTANT) - Q_PROPERTY(QString icon READ icon CONSTANT) - Q_PROPERTY(bool configurationRequired READ configurationRequired NOTIFY configurationRequiredChanged) public: /** @@ -168,27 +164,7 @@ class PLASMA_EXPORT ContainmentActions : public QObject * for example, when right-clicking an applet, the "Activity Options" submenu is populated * with this. */ - Q_INVOKABLE virtual QList contextualActions(); - - /** - * Loads the given DataEngine - * - * Tries to load the data engine given by @p name. Each engine is - * only loaded once, and that instance is re-used on all subsequent - * requests. - * - * If the data engine was not found, an invalid data engine is returned - * (see DataEngine::isValid()). - * - * Note that you should not delete the returned engine. - * - * @param name Name of the data engine to load - * @return pointer to the data engine if it was loaded, - * or an invalid data engine if the requested engine - * could not be loaded - * - */ - DataEngine *dataEngine(const QString &name) const; + virtual QList contextualActions(); /** * @return true if the containmentactions currently needs to be configured, diff --git a/src/plasma/private/containmentactions_p.h b/src/plasma/private/containmentactions_p.h index 6fb3d73b7..2aec48998 100644 --- a/src/plasma/private/containmentactions_p.h +++ b/src/plasma/private/containmentactions_p.h @@ -20,12 +20,11 @@ #ifndef PLASMA_CONTAINMENTACTIONSPRIVATE_H #define PLASMA_CONTAINMENTACTIONSPRIVATE_H -#include "dataengineconsumer.h" namespace Plasma { -class ContainmentActionsPrivate : public DataEngineConsumer +class ContainmentActionsPrivate { public: ContainmentActionsPrivate(KService::Ptr service, ContainmentActions *containmentActions) :