diff --git a/applet.cpp b/applet.cpp index e47ab40a7..ed4ea80d0 100644 --- a/applet.cpp +++ b/applet.cpp @@ -87,7 +87,6 @@ #include "scripting/appletscript.h" #include "svg.h" #include "framesvg.h" -#include "private/applethandle_p.h" #include "private/framesvg_p.h" #include "remote/authorizationmanager.h" #include "remote/authorizationmanager_p.h" @@ -829,13 +828,6 @@ void Applet::flushPendingConstraintsEvents() action->setEnabled(canConfig); } - if (!unlocked && d->handle) { - AppletHandle *h = d->handle.data(); - disconnect(this); - - h->deleteLater(); - } - emit immutabilityChanged(immutability()); } diff --git a/private/applet_p.h b/private/applet_p.h index edcb2961a..754afa57c 100644 --- a/private/applet_p.h +++ b/private/applet_p.h @@ -27,9 +27,11 @@ #include #include +#include +#include +#include -#include "plasma/animator.h" -#include "plasma/private/applethandle_p.h" +#include "plasma/applet.h" #include "plasma/dataengineconsumer.h" #include "plasma/ui_publish.h" @@ -146,7 +148,6 @@ public: QVariantList args; // bookkeeping - QSet registeredAsDragHandle; Plasma::FrameSvg *background; KConfigGroup *mainConfig; Plasma::Constraints pendingConstraints; @@ -155,7 +156,6 @@ public: AppletScript *script; Package *package; ConfigLoader *configLoader; - QWeakPointer handle; // actions stuff; put activationAction into actions? KActionCollection *actions;