we already have an applet version of the pointer; no need to go casting about
svn path=/trunk/KDE/kdelibs/; revision=1118045
This commit is contained in:
parent
644859eec4
commit
59505c7f07
@ -211,7 +211,7 @@ public:
|
|||||||
q->removeItem(applet);
|
q->removeItem(applet);
|
||||||
delete applet;
|
delete applet;
|
||||||
}
|
}
|
||||||
containment = new Containment(0, 0, id);
|
applet = containment = new Containment(0, 0, id);
|
||||||
|
|
||||||
if (pluginName == "null") {
|
if (pluginName == "null") {
|
||||||
containment->setDrawWallpaper(false);
|
containment->setDrawWallpaper(false);
|
||||||
@ -222,10 +222,10 @@ public:
|
|||||||
containment->setFormFactor(Plasma::Planar);
|
containment->setFormFactor(Plasma::Planar);
|
||||||
}
|
}
|
||||||
|
|
||||||
static_cast<Applet*>(containment)->d->isContainment = true;
|
applet->d->isContainment = true;
|
||||||
containment->setPos(containment->d->preferredPos(q));
|
containment->setPos(containment->d->preferredPos(q));
|
||||||
q->addItem(containment);
|
q->addItem(containment);
|
||||||
static_cast<Applet*>(containment)->d->setIsContainment(true, true);
|
applet->d->setIsContainment(true, true);
|
||||||
containments.append(containment);
|
containments.append(containment);
|
||||||
|
|
||||||
if (!delayedInit) {
|
if (!delayedInit) {
|
||||||
@ -482,7 +482,6 @@ void Corona::loadLayout(const QString &configName)
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach (Containment *containment, d->containments) {
|
foreach (Containment *containment, d->containments) {
|
||||||
|
|
||||||
QString cid = QString::number(containment->id());
|
QString cid = QString::number(containment->id());
|
||||||
KConfigGroup *appletsConfigGroup = 0;
|
KConfigGroup *appletsConfigGroup = 0;
|
||||||
if (mergeConfig) {
|
if (mergeConfig) {
|
||||||
|
Loading…
Reference in New Issue
Block a user