alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

direct calls now that these are virtuals

Browse Source
This commit is contained in:
Aaron Seigo 2011-05-26 18:58:17 +02:00
parent 91352e1a2d
commit 26a9c30d47
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
containment.cpp
View File

@ -339,7 +339,9 @@ void Containment::restore(KConfigGroup &group)
setWallpaper(group.readEntry("wallpaperplugin", defaultWallpaper), setWallpaper(group.readEntry("wallpaperplugin", defaultWallpaper),
group.readEntry("wallpaperpluginmode", defaultWallpaperMode)); group.readEntry("wallpaperpluginmode", defaultWallpaperMode));
QMetaObject::invokeMethod(d->toolBox.data(), "restore", Q_ARG(KConfigGroup, group)); if (d->toolBox) {
d->toolBox.data()->restore(group);
}
KConfigGroup cfg; KConfigGroup cfg;
if (containmentType() == PanelContainment || containmentType() == CustomPanelContainment) { if (containmentType() == PanelContainment || containmentType() == CustomPanelContainment) {
@ -425,7 +427,9 @@ void Containment::save(KConfigGroup &g) const
group.writeEntry("location", (int)d->location); group.writeEntry("location", (int)d->location);
group.writeEntry("activityId", d->activityId); group.writeEntry("activityId", d->activityId);
QMetaObject::invokeMethod(d->toolBox.data(), "save", Q_ARG(KConfigGroup, group)); if (d->toolBox) {
d->toolBox.data()->save(group);
}
if (d->wallpaper) { if (d->wallpaper) {
@ -784,7 +788,9 @@ void Containment::setFormFactor(FormFactor formFactor)
d->positionPanel(true); d->positionPanel(true);
} }
QMetaObject::invokeMethod(d->toolBox.data(), "reposition"); if (d->toolBox) {
d->toolBox.data()->reposition();
}
updateConstraints(Plasma::FormFactorConstraint); updateConstraints(Plasma::FormFactorConstraint);
@ -2148,7 +2154,9 @@ void ContainmentPrivate::createToolBox()
void ContainmentPrivate::positionToolBox() void ContainmentPrivate::positionToolBox()
{ {
QMetaObject::invokeMethod(toolBox.data(), "reposition"); if (toolBox) {
toolBox.data()->reposition();
}
} }
void ContainmentPrivate::updateToolBoxVisibility() void ContainmentPrivate::updateToolBoxVisibility()