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

get rid of handles

Browse Source
This commit is contained in:
Marco Martin 2012-09-24 21:28:13 +02:00
parent 1cf7a6214c
commit 93bb58a9f3
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
applet.cpp
View File

@ -87,7 +87,6 @@
#include "scripting/appletscript.h" #include "scripting/appletscript.h"
#include "svg.h" #include "svg.h"
#include "framesvg.h" #include "framesvg.h"
#include "private/applethandle_p.h"
#include "private/framesvg_p.h" #include "private/framesvg_p.h"
#include "remote/authorizationmanager.h" #include "remote/authorizationmanager.h"
#include "remote/authorizationmanager_p.h" #include "remote/authorizationmanager_p.h"
@ -829,13 +828,6 @@ void Applet::flushPendingConstraintsEvents()
action->setEnabled(canConfig); action->setEnabled(canConfig);
} }
if (!unlocked && d->handle) {
AppletHandle *h = d->handle.data();
disconnect(this);
h->deleteLater();
}
emit immutabilityChanged(immutability()); emit immutabilityChanged(immutability());
} }

8
private/applet_p.h
View File

@ -27,9 +27,11 @@
#include <kactioncollection.h> #include <kactioncollection.h>
#include <kconfigdialog.h> #include <kconfigdialog.h>
#include <kconfigskeleton.h>
#include <kservice.h>
#include <kplugininfo.h>
#include "plasma/animator.h" #include "plasma/applet.h"
#include "plasma/private/applethandle_p.h"
#include "plasma/dataengineconsumer.h" #include "plasma/dataengineconsumer.h"
#include "plasma/ui_publish.h" #include "plasma/ui_publish.h"
@ -146,7 +148,6 @@ public:
QVariantList args; QVariantList args;
// bookkeeping // bookkeeping
QSet<QGraphicsItem*> registeredAsDragHandle;
Plasma::FrameSvg *background; Plasma::FrameSvg *background;
KConfigGroup *mainConfig; KConfigGroup *mainConfig;
Plasma::Constraints pendingConstraints; Plasma::Constraints pendingConstraints;
@ -155,7 +156,6 @@ public:
AppletScript *script; AppletScript *script;
Package *package; Package *package;
ConfigLoader *configLoader; ConfigLoader *configLoader;
QWeakPointer<AppletHandle> handle;
// actions stuff; put activationAction into actions? // actions stuff; put activationAction into actions?
KActionCollection *actions; KActionCollection *actions;