remove AppletPrivate::selectItemToDestroy()
This commit is contained in:
parent
3d3a99aa0d
commit
798fc9271b
@ -725,7 +725,7 @@ void Applet::flushPendingConstraintsEvents()
|
|||||||
if (closeApplet) {
|
if (closeApplet) {
|
||||||
closeApplet->setEnabled(unlocked);
|
closeApplet->setEnabled(unlocked);
|
||||||
closeApplet->setVisible(unlocked);
|
closeApplet->setVisible(unlocked);
|
||||||
connect(closeApplet, SIGNAL(triggered(bool)), this, SLOT(selectItemToDestroy()), Qt::UniqueConnection);
|
connect(closeApplet, SIGNAL(triggered(bool)), this, SLOT(destroy()), Qt::UniqueConnection);
|
||||||
}
|
}
|
||||||
|
|
||||||
QAction *configAction = d->actions->action("configure");
|
QAction *configAction = d->actions->action("configure");
|
||||||
|
1
applet.h
1
applet.h
@ -899,7 +899,6 @@ class PLASMA_EXPORT Applet : public QObject
|
|||||||
Applet(const QString &packagePath, uint appletId, const QVariantList &args);
|
Applet(const QString &packagePath, uint appletId, const QVariantList &args);
|
||||||
|
|
||||||
Q_PRIVATE_SLOT(d, void cleanUpAndDelete())
|
Q_PRIVATE_SLOT(d, void cleanUpAndDelete())
|
||||||
Q_PRIVATE_SLOT(d, void selectItemToDestroy())
|
|
||||||
Q_PRIVATE_SLOT(d, void configDialogFinished())
|
Q_PRIVATE_SLOT(d, void configDialogFinished())
|
||||||
Q_PRIVATE_SLOT(d, void updateShortcuts())
|
Q_PRIVATE_SLOT(d, void updateShortcuts())
|
||||||
Q_PRIVATE_SLOT(d, void publishCheckboxStateChanged(int state))
|
Q_PRIVATE_SLOT(d, void publishCheckboxStateChanged(int state))
|
||||||
|
@ -24,7 +24,6 @@ Functionality Blocks
|
|||||||
Porting of Applet and Containment
|
Porting of Applet and Containment
|
||||||
=================================
|
=================================
|
||||||
|
|
||||||
* AppletPrivate::selectItemToDestroy()
|
|
||||||
* ContainmentPrivate::appletAt(const QPointF &point)
|
* ContainmentPrivate::appletAt(const QPointF &point)
|
||||||
* ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventInvalidDesktops)
|
* ContainmentPrivate::setScreen(int newScreen, int newDesktop, bool preventInvalidDesktops)
|
||||||
* all geometry functions in Applet and Containment (width, height, geometry, raise, lower...)
|
* all geometry functions in Applet and Containment (width, height, geometry, raise, lower...)
|
||||||
|
@ -199,31 +199,6 @@ void AppletPrivate::init(const QString &packagePath)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AppletPrivate::selectItemToDestroy()
|
|
||||||
{
|
|
||||||
//FIXME: this will not work nicely with multiple screens and being zoomed out!
|
|
||||||
//TODO: port away from QGV
|
|
||||||
/*
|
|
||||||
if (isContainment) {
|
|
||||||
QGraphicsView *view = q->view();
|
|
||||||
if (view && view->transform().isScaling() &&
|
|
||||||
q->scene()->focusItem() != q) {
|
|
||||||
QGraphicsItem *focus = q->scene()->focusItem();
|
|
||||||
|
|
||||||
if (focus) {
|
|
||||||
Containment *toDestroy = dynamic_cast<Containment*>(focus->topLevelItem());
|
|
||||||
|
|
||||||
if (toDestroy) {
|
|
||||||
toDestroy->destroy();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
|
|
||||||
q->destroy();
|
|
||||||
}
|
|
||||||
|
|
||||||
void AppletPrivate::cleanUpAndDelete()
|
void AppletPrivate::cleanUpAndDelete()
|
||||||
{
|
{
|
||||||
// reimplemented in the UI specific library
|
// reimplemented in the UI specific library
|
||||||
|
@ -108,7 +108,6 @@ public:
|
|||||||
KConfigGroup *mainConfigGroup();
|
KConfigGroup *mainConfigGroup();
|
||||||
QString visibleFailureText(const QString &reason);
|
QString visibleFailureText(const QString &reason);
|
||||||
void resetConfigurationObject();
|
void resetConfigurationObject();
|
||||||
void selectItemToDestroy();
|
|
||||||
void addGlobalShortcutsPage(KConfigDialog *dialog);
|
void addGlobalShortcutsPage(KConfigDialog *dialog);
|
||||||
void addPublishPage(KConfigDialog *dialog);
|
void addPublishPage(KConfigDialog *dialog);
|
||||||
void configDialogFinished();
|
void configDialogFinished();
|
||||||
|
Loading…
Reference in New Issue
Block a user