From 87c70a42b45c03aaa677eb62c7e1d4c543e2d351 Mon Sep 17 00:00:00 2001
From: Antonis Tsiapaliokas <kok3rs@gmail.com>
Date: Mon, 24 Sep 2012 14:58:54 +0300
Subject: [PATCH] appletDestroyed() is emitted in ~Applet(). But this can
 happen even if it isn't destroyed but it just have been deleted. So we rename
 the appletDestroyed() to appletDeleted().

---
 applet.cpp                | 4 +---
 applet.h                  | 2 +-
 containment.cpp           | 2 +-
 containment.h             | 2 +-
 plasma.kdev4              | 3 ---
 private/applethandle.cpp  | 2 +-
 private/containment_p.cpp | 2 +-
 private/containment_p.h   | 2 +-
 8 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 100644 plasma.kdev4

diff --git a/applet.cpp b/applet.cpp
index 39a9d40a9..364ef6a0d 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -197,7 +197,7 @@ Applet::Applet(const QString &packagePath, uint appletId, const QVariantList &ar
 Applet::~Applet()
 {
     //let people know that i will die
-    emit appletDestroyed(this);
+    emit appletDeleted(this);
 
     // clean up our config dialog, if any
     delete KConfigDialog::exists(d->configDialogId());
@@ -388,8 +388,6 @@ bool Applet::destroyed() const
     return d->transient;
 }
 
-
-
 ConfigLoader *Applet::configScheme() const
 {
     return d->configLoader;
diff --git a/applet.h b/applet.h
index f93824e3b..1c1661e97 100644
--- a/applet.h
+++ b/applet.h
@@ -671,7 +671,7 @@ class PLASMA_EXPORT Applet : public QGraphicsWidget
         /**
          * Emitted when the applet is deleted
          */
-        void appletDestroyed(Plasma::Applet *applet);
+        void appletDeleted(Plasma::Applet *applet);
 
         /**
          * Emitted when the applet status changes
diff --git a/containment.cpp b/containment.cpp
index 9e6630000..cf0312b22 100644
--- a/containment.cpp
+++ b/containment.cpp
@@ -739,7 +739,7 @@ void Containment::addApplet(Applet *applet, const QPointF &pos, bool delayInit)
 
     connect(applet, SIGNAL(configNeedsSaving()), this, SIGNAL(configNeedsSaving()));
     connect(applet, SIGNAL(releaseVisualFocus()), this, SIGNAL(releaseVisualFocus()));
-    connect(applet, SIGNAL(appletDestroyed(Plasma::Applet*)), this, SLOT(appletDestroyed(Plasma::Applet*)));
+    connect(applet, SIGNAL(appletDeleted(Plasma::Applet*)), this, SLOT(appletDestroyed(Plasma::Applet*)));
     connect(applet, SIGNAL(newStatus(Plasma::ItemStatus)), this, SLOT(checkStatus(Plasma::ItemStatus)));
     connect(applet, SIGNAL(activate()), this, SIGNAL(activate()));
 
diff --git a/containment.h b/containment.h
index f0cdc18ff..aee6466bc 100644
--- a/containment.h
+++ b/containment.h
@@ -607,7 +607,7 @@ Q_SIGNALS:
          */
         Containment(const QString &packagePath, uint appletId, const QVariantList &args);
 
-        Q_PRIVATE_SLOT(d, void appletDestroyed(Plasma::Applet*))
+        Q_PRIVATE_SLOT(d, void appletDeleted(Plasma::Applet*))
         Q_PRIVATE_SLOT(d, void triggerShowAddWidgets())
         Q_PRIVATE_SLOT(d, void positionToolBox())
         Q_PRIVATE_SLOT(d, void requestConfiguration())
diff --git a/plasma.kdev4 b/plasma.kdev4
deleted file mode 100644
index a412a8502..000000000
--- a/plasma.kdev4
+++ /dev/null
@@ -1,3 +0,0 @@
-[Project]
-Manager=KDevCMakeManager
-Name=plasmaframeworks5
diff --git a/private/applethandle.cpp b/private/applethandle.cpp
index 0c068dad4..289b010f4 100644
--- a/private/applethandle.cpp
+++ b/private/applethandle.cpp
@@ -93,7 +93,7 @@ AppletHandle::AppletHandle(Containment *containment, Applet *applet, const QPoin
 
     connect(m_hoverTimer, SIGNAL(timeout()), this, SLOT(hoverTimeout()));
     connect(m_leaveTimer, SIGNAL(timeout()), this, SLOT(leaveTimeout()));
-    connect(m_applet, SIGNAL(appletDestroyed(Plasma::Applet*)), this, SLOT(appletDestroyed()));
+    connect(m_applet, SIGNAL(appletDeleted(Plasma::Applet*)), this, SLOT(appletDeleted()));
 
     setAcceptsHoverEvents(true);
     m_hoverTimer->start();
diff --git a/private/containment_p.cpp b/private/containment_p.cpp
index efccedb23..1e4310e15 100644
--- a/private/containment_p.cpp
+++ b/private/containment_p.cpp
@@ -927,7 +927,7 @@ bool ContainmentPrivate::regionIsEmpty(const QRectF &region, Applet *ignoredAppl
     return true;
 }
 
-void ContainmentPrivate::appletDestroyed(Plasma::Applet *applet)
+void ContainmentPrivate::appletDeleted(Plasma::Applet *applet)
 {
     applets.removeAll(applet);
     if (focusedApplet == applet) {
diff --git a/private/containment_p.h b/private/containment_p.h
index 7644f4683..c7dc8b41b 100644
--- a/private/containment_p.h
+++ b/private/containment_p.h
@@ -102,7 +102,7 @@ public:
     QPointF preferredPos(Corona *corona) const;
     QPointF preferredPanelPos(Corona *corona) const;
     void setLockToolText();
-    void appletDestroyed(Applet*);
+    void appletDeleted(Applet*);
     void appletAppeared(Applet*);
     void clearDataForMimeJob(KIO::Job *job);
     void remoteAppletReady(Plasma::AccessAppletJob *job);