[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

addUMLView(): Simplify the loop for finding a unique name.


  M +4 -11     umldoc.cpp   1.48


--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.47:1.48
@@ -1663,16 +1663,9 @@ bool UMLDoc::addUMLView(UMLViewData * pV
         QString viewName = (QString)pViewData->getName();
         QString name = viewName;
-        while(true) {
-                UMLView * o = findView(pViewData->getType(), name);
-                if(o) {
-                        name = viewName;
-                        name += "_" + QString::number(++i);
-                        o = findView(pViewData->getType(), name);
-                } else {
+        while( findView(pViewData->getType(), name) != NULL) {
+                name = viewName + "_" + QString::number(++i);
+        }
                         if(i) //If name was modified
                                 pViewData->setName(name);
-                        break;
-                }
-        }
         int result = assignNewID(pViewData->getID());
         pViewData->setID(result);