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

make extender::groups() work without assigning groups to themselves

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=1128236
This commit is contained in:
Marco Martin 2010-05-18 18:55:00 +00:00
parent 6eade776e2
commit 3aee2db14e
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extenders/extender.cpp
View File

@ -284,8 +284,9 @@ QList<ExtenderGroup*> Extender::groups() const
QList<ExtenderGroup *> result; QList<ExtenderGroup *> result;
foreach (ExtenderItem *item, d->attachedExtenderItems) { foreach (ExtenderItem *item, d->attachedExtenderItems) {
if (item->isGroup() && !result.contains(item->group())) { if (item->isGroup() && !result.contains(item->group())) {
if (item->group()) { ExtenderGroup *group = qobject_cast<ExtenderGroup *>(item);
result.append(item->group()); if (group) {
result.append(group);
} }
} }
} }

1
extenders/extendergroup.cpp
View File

@ -99,7 +99,6 @@ ExtenderGroup::ExtenderGroup(Extender *parent, uint groupId)
connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()), connect(Plasma::Theme::defaultTheme(), SIGNAL(themeChanged()),
this, SLOT(themeChanged())); this, SLOT(themeChanged()));
setGroup(this);
} }
ExtenderGroup::~ExtenderGroup() ExtenderGroup::~ExtenderGroup()

5
extenders/extenderitem.cpp
View File

@ -375,13 +375,8 @@ void ExtenderItem::setGroup(ExtenderGroup *group)
void ExtenderItem::setGroup(ExtenderGroup *group, const QPointF &pos) void ExtenderItem::setGroup(ExtenderGroup *group, const QPointF &pos)
{ {
if (isGroup()) { if (isGroup()) {
if (group == this) {
//a group of a group is always just itself
d->group = group;
} else {
//nesting extender groups is just insane. I don't think we'd even want to support that. //nesting extender groups is just insane. I don't think we'd even want to support that.
kWarning() << "Nesting ExtenderGroups is not supported"; kWarning() << "Nesting ExtenderGroups is not supported";
}
return; return;
} }