alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove properties and dataEngine

Browse Source 
dataEngine() is no more present in ContainmentActions: DataEngineConsumer is public now
This commit is contained in:
Marco Martin 2013-02-25 14:28:05 +01:00
parent 75ddf58938
commit 4052f596f9
3 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plasma/containmentactions.cpp
View File

@ -35,7 +35,6 @@
#include <klocalizedstring.h>
#include <kservicetypetrader.h>
#include "dataengineconsumer.h"
#include "version.h"
namespace Plasma
@ -179,11 +178,6 @@ QList<QAction*> ContainmentActions::contextualActions()
return QList<QAction*>();
}
DataEngine *ContainmentActions::dataEngine(const QString &name) const
{
return d->dataEngine(name);
}
bool ContainmentActions::configurationRequired() const
{
return d->needsConfig;

26
src/plasma/containmentactions.h
View File

@ -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<QAction*> 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 <em>not</em> 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<QAction*> contextualActions();
/**
* @return true if the containmentactions currently needs to be configured,

3
src/plasma/private/containmentactions_p.h
View File

@ -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) :