From 585c1ec21ed857737b6c7eb9def843b0c302d19f Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Mon, 4 Mar 2013 16:15:04 +0100
Subject: [PATCH] remove appletMimeType()

 addContainment becomes createContainment
---
 src/kpart/plasmakpartcorona.cpp |  2 +-
 src/plasma/corona.cpp           | 13 +------------
 src/plasma/corona.h             | 13 +------------
 src/plasma/private/corona_p.h   |  1 -
 src/shell/desktopcorona.cpp     |  4 ++--
 5 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/kpart/plasmakpartcorona.cpp b/src/kpart/plasmakpartcorona.cpp
index 6bcece1cd..e1b42b09b 100644
--- a/src/kpart/plasmakpartcorona.cpp
+++ b/src/kpart/plasmakpartcorona.cpp
@@ -42,7 +42,7 @@ PlasmaKPartCorona::PlasmaKPartCorona(QObject *parent)
 void PlasmaKPartCorona::loadDefaultLayout()
 {
     // used to force a save into the config file
-    Plasma::Containment *c = addContainment(QString());
+    Plasma::Containment *c = createContainment(QString());
 
     if (!c) {
         // do some error reporting?
diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp
index 6f90ca2c0..e0e61cddc 100644
--- a/src/plasma/corona.cpp
+++ b/src/plasma/corona.cpp
@@ -75,16 +75,6 @@ Plasma::Package Corona::package() const
     return d->package;
 }
 
-void Corona::setAppletMimeType(const QString &type)
-{
-    d->mimetype = type;
-}
-
-QString Corona::appletMimeType()
-{
-    return d->mimetype;
-}
-
 void Corona::setDefaultContainmentPlugin(const QString &name)
 {
     // we could check if it is in:
@@ -257,7 +247,7 @@ KSharedConfigPtr Corona::config() const
     return d->config;
 }
 
-Containment *Corona::addContainment(const QString &name, const QVariantList &args)
+Containment *Corona::createContainment(const QString &name, const QVariantList &args)
 {
     if (d->immutability == Mutable) {
         return d->addContainment(name, args, 0);
@@ -396,7 +386,6 @@ QHash<QString, QString> Corona::defaultContainmentActionsPlugins(ContainmentType
 CoronaPrivate::CoronaPrivate(Corona *corona)
     : q(corona),
       immutability(Mutable),
-      mimetype("text/x-plasmoidservicename"),
       defaultContainmentPlugin("desktop"),
       config(0),
       configSyncTimer(new QTimer(corona)),
diff --git a/src/plasma/corona.h b/src/plasma/corona.h
index 5a1578c8b..8cea60642 100644
--- a/src/plasma/corona.h
+++ b/src/plasma/corona.h
@@ -61,17 +61,6 @@ public:
      **/
     Plasma::Package package() const;
 
-    /**
-     *  Sets the mimetype of Drag/Drop items. Default is
-     *  text/x-plasmoidservicename
-     */
-    void setAppletMimeType(const QString &mimetype);
-
-    /**
-     * The current mime type of Drag/Drop items.
-     */
-    QString appletMimeType();
-
     /**
      * @return the default containment plugin type
      * @since 4.7
@@ -103,7 +92,7 @@ public:
      * when widgets are locked, or if the requested containment plugin can not be located
      * or successfully loaded.
      */
-    Containment *addContainment(const QString &name, const QVariantList &args = QVariantList());
+    Containment *createContainment(const QString &name, const QVariantList &args = QVariantList());
 
     /**
      * Returns the Containment, if any, for a given physical screen and desktop
diff --git a/src/plasma/private/corona_p.h b/src/plasma/private/corona_p.h
index db4b19c91..97c60932f 100644
--- a/src/plasma/private/corona_p.h
+++ b/src/plasma/private/corona_p.h
@@ -56,7 +56,6 @@ public:
     Corona *q;
     Package package;
     ImmutabilityType immutability;
-    QString mimetype;
     QString configName;
     QString defaultContainmentPlugin;
     KSharedConfigPtr config;
diff --git a/src/shell/desktopcorona.cpp b/src/shell/desktopcorona.cpp
index c81910b36..8882c4945 100644
--- a/src/shell/desktopcorona.cpp
+++ b/src/shell/desktopcorona.cpp
@@ -53,7 +53,7 @@ DesktopCorona::~DesktopCorona()
 
 void DesktopCorona::loadDefaultLayout()
 {
-    Plasma::Containment *cont = addContainment("org.kde.testcontainment");
+    Plasma::Containment *cont = createContainment("org.kde.testcontainment");
     cont->setScreen(0);
     qDebug() << containmentForScreen(0);
     Plasma::Applet *appl = cont->createApplet("org.kde.testapplet");
@@ -118,7 +118,7 @@ void DesktopCorona::checkDesktop(/*Activity *activity,*/ bool signalWhenExists,
 
     //TODO: remove following when activities are restored
     if (!c) {
-        c = addContainment("desktop");
+        c = createContainment("desktop");
     }
 
     if (!c) {