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

no longer provide access to the package from the class, let Package do that; adapt to Package merge

Browse Source
This commit is contained in:
Aaron Seigo 2011-07-15 13:02:15 +02:00
parent bbc569740e
commit 1dde80056b
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
containmentactions.cpp
View File

@ -42,8 +42,6 @@
namespace Plasma namespace Plasma
{ {
PackageStructure::Ptr ContainmentActionsPrivate::s_packageStructure(0);
ContainmentActions::ContainmentActions(QObject * parentObject) ContainmentActions::ContainmentActions(QObject * parentObject)
: d(new ContainmentActionsPrivate(KService::serviceByStorageId(QString()), this)) : d(new ContainmentActionsPrivate(KService::serviceByStorageId(QString()), this))
{ {
@ -119,15 +117,6 @@ ContainmentActions *ContainmentActions::load(Containment *parent, const KPluginI
return load(parent, info.pluginName(), args); return load(parent, info.pluginName(), args);
} }
PackageStructure::Ptr ContainmentActions::packageStructure()
{
if (!ContainmentActionsPrivate::s_packageStructure) {
ContainmentActionsPrivate::s_packageStructure = new ContainmentActionsPackage();
}
return ContainmentActionsPrivate::s_packageStructure;
}
Containment *ContainmentActions::containment() Containment *ContainmentActions::containment()
{ {
if (d->containment) { if (d->containment) {

6
containmentactions.h
View File

@ -25,7 +25,6 @@
#include <kplugininfo.h> #include <kplugininfo.h>
#include <plasma/plasma.h> #include <plasma/plasma.h>
#include <plasma/packagestructure.h>
#include <plasma/version.h> #include <plasma/version.h>
class QAction; class QAction;
@ -102,11 +101,6 @@ class PLASMA_EXPORT ContainmentActions : public QObject
**/ **/
static ContainmentActions *load(Containment *parent, const KPluginInfo &info, const QVariantList &args = QVariantList()); static ContainmentActions *load(Containment *parent, const KPluginInfo &info, const QVariantList &args = QVariantList());
/**
* Returns the Package specialization for containmentactions.
*/
static PackageStructure::Ptr packageStructure();
/** /**
* Returns the user-visible name for the containmentactions, as specified in the * Returns the user-visible name for the containmentactions, as specified in the
* .desktop file. * .desktop file.

2
private/containmentactions_p.h
View File

@ -37,8 +37,6 @@ public:
{ {
}; };
static PackageStructure::Ptr s_packageStructure;
ContainmentActions *q; ContainmentActions *q;
KPluginInfo containmentActionsDescription; KPluginInfo containmentActionsDescription;
Package *package; Package *package;