remove some old code from when creating the toolbox created the actions and custom containments never had toolbox; that was an implementation detail that no longer fits the definitions (e.g. custom containments can now have toolboxes if they so wish)
svn path=/trunk/KDE/kdelibs/; revision=943974
This commit is contained in:
parent
1427ff946c
commit
9c6bd76035
11
applet.cpp
11
applet.cpp
@ -1967,17 +1967,6 @@ void AppletPrivate::setIsContainment(bool nowIsContainment, bool forceUpdate)
|
||||
delete mainConfig;
|
||||
mainConfig = 0;
|
||||
|
||||
Containment *c = qobject_cast<Containment*>(q);
|
||||
if (c) {
|
||||
if (isContainment) {
|
||||
// set up the toolbox
|
||||
c->d->createToolBox();
|
||||
} else {
|
||||
delete c->d->toolBox;
|
||||
c->d->toolBox = 0;
|
||||
}
|
||||
}
|
||||
|
||||
KAction *configAction = qobject_cast<KAction*>(actions.action("configure"));
|
||||
if (configAction) {
|
||||
QObject::disconnect(configAction, SIGNAL(triggered()), q, SLOT(requestConfiguration()));
|
||||
|
Loading…
x
Reference in New Issue
Block a user