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

clearContainments is unused and ACTUALLY remove the containments when init'ing

Browse Source
This commit is contained in:
Aaron Seigo 2013-02-18 13:17:48 +01:00
parent dcc4c58bf7
commit 1303008ee6
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plasma/corona.cpp
View File

@ -172,7 +172,15 @@ void Corona::requireConfigSync()
void Corona::initializeLayout(const QString &configName) void Corona::initializeLayout(const QString &configName)
{ {
clearContainments(); {
QList<Containment *> containments = d->containments;
d->containments.clear();
foreach (Containment *containment, containments) {
disconnect(containment, 0, this, 0);
containment->destroy();
}
}
loadLayout(configName); loadLayout(configName);
if (d->containments.isEmpty()) { if (d->containments.isEmpty()) {
@ -244,13 +252,6 @@ QList<Containment*> Corona::containments() const
return d->containments; return d->containments;
} }
void Corona::clearContainments()
{
foreach (Containment *containment, d->containments) {
containment->clearApplets();
}
}
KSharedConfigPtr Corona::config() const KSharedConfigPtr Corona::config() const
{ {
if (!d->config) { if (!d->config) {

5
src/plasma/corona.h
View File

@ -84,11 +84,6 @@ public:
*/ */
QList<Containment*> containments() const; QList<Containment*> containments() const;
/**
* Clear the CoronaBase from all applets.
*/
void clearContainments();
/** /**
* Returns the config file used to store the configuration for this CoronaBase * Returns the config file used to store the configuration for this CoronaBase
*/ */