[Uml-devel] [Bug 122668] memory problem when importing classes from c++ sources

[Oliver Kellogg]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=122668         
okellogg users sourceforge net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From okellogg users sourceforge net  2006-03-26 16:29 -------
SVN commit 522714 by okellogg:

findUMLObject(): Detect name match with a surrounding scope proper.
(The problem is triggered by the declaration "friend class RedBlackTree;"
int the nested class "iterator" of the p_tree.hpp attachment.)
BUG:122668


 M  +1 -1      ChangeLog  
 M  +8 -0      umbrello/model_utils.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #522713:522714
 @ -5,6 +5,7  @
 * Static variables in java code are not marked static (59190)
 * Save autosave file to a more obvious place (72019)
 * Usability and responsiveness improvements to code import (93296)
+* Memory problem when importing classes from c++ sources (122668)
 
 Version 1.5.2
 
 @ -32,7 +33,6  @
 * Crash when importing Python files (121952)
 * "void" is imported as class and not datatypes (122184)
 * Crash when creating a datatype with the same name as a class (122188)
-* Memory problem when importing classes from c++ sources (122668)
 * Crash when refusing to rename a class on importing typedef (122914)
 * Java import fails at abstract methods or interfaces (123661)
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/model_utils.cpp #522713:522714
 @ -139,6 +139,14  @
         // Remember packages that we've seen - for avoiding cycles.
         UMLPackageList seenPkgs;
         for (; pkg; pkg = currentObj->getUMLPackage()) {
+            if (nameWithoutFirstPrefix.isEmpty()) {
+                if (caseSensitive) {
+                    if (pkg->getName() == name)
+                        return pkg;
+                } else if (pkg->getName().lower() == name.lower()) {
+                    return pkg;
+                }
+            }
             if (seenPkgs.findRef(pkg) != -1) {
                 kdError() << "findUMLObject(" << name << "): "
                 << "breaking out of cycle involving "