diff --git a/applet.cpp b/applet.cpp index 34d8f5279..2b0ecda5e 100644 --- a/applet.cpp +++ b/applet.cpp @@ -759,7 +759,7 @@ bool Applet::isImmutable() const bool Applet::isKioskImmutable() const { Corona *c = dynamic_cast(scene()); - return d->kioskImmutable || (c && c->isKioskImmutable()); + return d->kioskImmutable || (c && c->isImmutable()); } void Applet::setImmutable(bool immutable) @@ -866,7 +866,7 @@ void Applet::checkImmutability() { d->kioskImmutable = globalConfig().isImmutable() || config().isImmutable() || (containment() && containment()->isKioskImmutable()) || - (dynamic_cast(scene()) && static_cast(scene())->isKioskImmutable()); + (dynamic_cast(scene()) && static_cast(scene())->isImmutable()); if (d->kioskImmutable) { updateConstraints(ImmutableConstraint); diff --git a/corona.cpp b/corona.cpp index 829cb388c..e3efaad79 100644 --- a/corona.cpp +++ b/corona.cpp @@ -431,11 +431,6 @@ bool Corona::isImmutable() const return d->kioskImmutable || d->immutable; } -bool Corona::isKioskImmutable() const -{ - return d->kioskImmutable; -} - void Corona::setImmutable(bool immutable) { if (d->immutable == immutable || diff --git a/corona.h b/corona.h index 3cbfecf75..f871331d7 100644 --- a/corona.h +++ b/corona.h @@ -50,11 +50,6 @@ public: **/ bool isImmutable() const; - /** - * @return true if this Corona is immutable due to Kiosk settings - */ - bool isKioskImmutable() const; - /** * A rect containing the maximum size a plasmoid on this corona should * consider being. @@ -170,7 +165,7 @@ Q_SIGNALS: */ void screenOwnerChanged(int wasScreen, int isScreen, Plasma::Containment *containment); -protected: +protected: void dragEnterEvent(QGraphicsSceneDragDropEvent* event); void dragLeaveEvent(QGraphicsSceneDragDropEvent* event); void dragMoveEvent(QGraphicsSceneDragDropEvent* event);