From 1dde80056bfc3a90c38ba0bd35dbb9a832df39b2 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Fri, 15 Jul 2011 13:02:15 +0200
Subject: [PATCH] no longer provide access to the package from the class, let
 Package do that; adapt to Package merge

---
 containmentactions.cpp         | 11 -----------
 containmentactions.h           |  6 ------
 private/containmentactions_p.h |  2 --
 3 files changed, 19 deletions(-)

diff --git a/containmentactions.cpp b/containmentactions.cpp
index 7868426a1..9f49b2870 100644
--- a/containmentactions.cpp
+++ b/containmentactions.cpp
@@ -42,8 +42,6 @@
 namespace Plasma
 {
 
-PackageStructure::Ptr ContainmentActionsPrivate::s_packageStructure(0);
-
 ContainmentActions::ContainmentActions(QObject * parentObject)
     : d(new ContainmentActionsPrivate(KService::serviceByStorageId(QString()), this))
 {
@@ -119,15 +117,6 @@ ContainmentActions *ContainmentActions::load(Containment *parent, const KPluginI
     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()
 {
     if (d->containment) {
diff --git a/containmentactions.h b/containmentactions.h
index 57239c3dc..c10512ccd 100644
--- a/containmentactions.h
+++ b/containmentactions.h
@@ -25,7 +25,6 @@
 #include <kplugininfo.h>
 
 #include <plasma/plasma.h>
-#include <plasma/packagestructure.h>
 #include <plasma/version.h>
 
 class QAction;
@@ -102,11 +101,6 @@ class PLASMA_EXPORT ContainmentActions : public QObject
          **/
         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
          * .desktop file.
diff --git a/private/containmentactions_p.h b/private/containmentactions_p.h
index e683533ca..643082828 100644
--- a/private/containmentactions_p.h
+++ b/private/containmentactions_p.h
@@ -37,8 +37,6 @@ public:
     {
     };
 
-    static PackageStructure::Ptr s_packageStructure;
-
     ContainmentActions *q;
     KPluginInfo containmentActionsDescription;
     Package *package;