API review:
remove IsKioskImmutable() from the public api svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=800623
This commit is contained in:
parent
34d3cbcee0
commit
06f5b7bc72
@ -759,7 +759,7 @@ bool Applet::isImmutable() const
|
|||||||
bool Applet::isKioskImmutable() const
|
bool Applet::isKioskImmutable() const
|
||||||
{
|
{
|
||||||
Corona *c = dynamic_cast<Corona*>(scene());
|
Corona *c = dynamic_cast<Corona*>(scene());
|
||||||
return d->kioskImmutable || (c && c->isKioskImmutable());
|
return d->kioskImmutable || (c && c->isImmutable());
|
||||||
}
|
}
|
||||||
|
|
||||||
void Applet::setImmutable(bool immutable)
|
void Applet::setImmutable(bool immutable)
|
||||||
@ -866,7 +866,7 @@ void Applet::checkImmutability()
|
|||||||
{
|
{
|
||||||
d->kioskImmutable = globalConfig().isImmutable() || config().isImmutable() ||
|
d->kioskImmutable = globalConfig().isImmutable() || config().isImmutable() ||
|
||||||
(containment() && containment()->isKioskImmutable()) ||
|
(containment() && containment()->isKioskImmutable()) ||
|
||||||
(dynamic_cast<Corona*>(scene()) && static_cast<Corona*>(scene())->isKioskImmutable());
|
(dynamic_cast<Corona*>(scene()) && static_cast<Corona*>(scene())->isImmutable());
|
||||||
|
|
||||||
if (d->kioskImmutable) {
|
if (d->kioskImmutable) {
|
||||||
updateConstraints(ImmutableConstraint);
|
updateConstraints(ImmutableConstraint);
|
||||||
|
@ -431,11 +431,6 @@ bool Corona::isImmutable() const
|
|||||||
return d->kioskImmutable || d->immutable;
|
return d->kioskImmutable || d->immutable;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Corona::isKioskImmutable() const
|
|
||||||
{
|
|
||||||
return d->kioskImmutable;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Corona::setImmutable(bool immutable)
|
void Corona::setImmutable(bool immutable)
|
||||||
{
|
{
|
||||||
if (d->immutable == immutable ||
|
if (d->immutable == immutable ||
|
||||||
|
7
corona.h
7
corona.h
@ -50,11 +50,6 @@ public:
|
|||||||
**/
|
**/
|
||||||
bool isImmutable() const;
|
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
|
* A rect containing the maximum size a plasmoid on this corona should
|
||||||
* consider being.
|
* consider being.
|
||||||
@ -170,7 +165,7 @@ Q_SIGNALS:
|
|||||||
*/
|
*/
|
||||||
void screenOwnerChanged(int wasScreen, int isScreen, Plasma::Containment *containment);
|
void screenOwnerChanged(int wasScreen, int isScreen, Plasma::Containment *containment);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void dragEnterEvent(QGraphicsSceneDragDropEvent* event);
|
void dragEnterEvent(QGraphicsSceneDragDropEvent* event);
|
||||||
void dragLeaveEvent(QGraphicsSceneDragDropEvent* event);
|
void dragLeaveEvent(QGraphicsSceneDragDropEvent* event);
|
||||||
void dragMoveEvent(QGraphicsSceneDragDropEvent* event);
|
void dragMoveEvent(QGraphicsSceneDragDropEvent* event);
|
||||||
|
Loading…
Reference in New Issue
Block a user