get rid of handles
This commit is contained in:
parent
1cf7a6214c
commit
93bb58a9f3
@ -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());
|
||||
}
|
||||
|
||||
|
@ -27,9 +27,11 @@
|
||||
|
||||
#include <kactioncollection.h>
|
||||
#include <kconfigdialog.h>
|
||||
#include <kconfigskeleton.h>
|
||||
#include <kservice.h>
|
||||
#include <kplugininfo.h>
|
||||
|
||||
#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<QGraphicsItem*> registeredAsDragHandle;
|
||||
Plasma::FrameSvg *background;
|
||||
KConfigGroup *mainConfig;
|
||||
Plasma::Constraints pendingConstraints;
|
||||
@ -155,7 +156,6 @@ public:
|
||||
AppletScript *script;
|
||||
Package *package;
|
||||
ConfigLoader *configLoader;
|
||||
QWeakPointer<AppletHandle> handle;
|
||||
|
||||
// actions stuff; put activationAction into actions?
|
||||
KActionCollection *actions;
|
||||
|
Loading…
Reference in New Issue
Block a user