[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/kdeui
From: David Faure <faure () kde ! org>
Date: 2009-01-17 2:27:12
Message-ID: 1232159232.367476.27279.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 912265 by dfaure:
Even for noMerge="1" menus, run the "check if we are empty" code, to prevent empty menus showing up.
The basic diff is:
if ( additive.attribute(attrNoMerge) == attrOne )
{
base.parentNode().replaceChild(additive, base);
- return true;
- }
-
+ base = additive;
+ } else {
[...merging code...]
}
[ empty menu code ]
return deleteMe;
... which forced a major re-indent.
Note that modifying the caller's "base" reference is _wanted_, otherwise the removeChild
call wouldn't work anymore, after we replaced "base" with "additive".
CCMAIL: kossebau@kde.org
M +15 -0 tests/kxmlgui_unittest.cpp
M +211 -215 xmlgui/kxmlguiclient.cpp
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic