[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 710708 by okellogg:

Dirk's dazzling dashboard detect defect

 M  +2 -1      codegenerators/javawriter.cpp  
 M  +2 -3      dialogs/classifierlistpage.cpp  
 M  +4 -4      umlview.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/javawriter.cpp #710707:710708
@@ -711,7 +711,8 @@
     if (atl1.count() != atl2.count())
         return false;
     for (UMLAttributeListIt atl1It( atl1 ), atl2It( atl2 ); atl1It.hasNext() && atl2It.hasNext(); ) {
-        UMLAttribute *at1, *at2;
+        UMLAttribute *at1 = atl1It.next();
+        UMLAttribute *at2 = atl2It.next();
         if (at1->getTypeName() != at2->getTypeName())
             return false;
     }
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/classifierlistpage.cpp #710707:710708
@@ -637,11 +637,10 @@
         return false;
     qApp->processEvents();
     peerIndex = -1;
-    UMLObject *o;
     const Uml::Object_Type seekType = listItem->getBaseType();
     UMLObjectList listItems = m_pClassifier->subordinates();
-    UMLObjectListIt it(listItems);
-    for (int i = 0; it.hasNext(); ++i, it.next()) {
+    for (int i = 0; i < listItems.count(); ++i) {
+        UMLObject *o = listItems.at(i);
         if (seekPeerBefore) {
             if (i >= wasAtIndex)
                 break;
--- trunk/KDE/kdesdk/umbrello/umbrello/umlview.cpp #710707:710708
@@ -3675,7 +3675,7 @@
 int UMLView::getSmallestX(const UMLWidgetList &widgetList) {
     UMLWidgetListIt it(widgetList);
 
-    int smallestX ;
+    int smallestX = 0;
 
     int i = 1;
     foreach ( UMLWidget *widget ,  widgetList ) {
@@ -3696,7 +3696,7 @@
     if ( widgetList.isEmpty() )
         return -1;
 
-    int smallestY ;
+    int smallestY = 0;
 
     int i = 1;
     foreach ( UMLWidget *widget ,  widgetList ) {
@@ -3716,7 +3716,7 @@
     if ( widgetList.isEmpty() )
         return -1;
 
-    int biggestX ;
+    int biggestX = 0;
 
     int i = 1;
     foreach ( UMLWidget *widget , widgetList ) {
@@ -3738,7 +3738,7 @@
     if ( widgetList.isEmpty() )
         return -1;
 
-    int biggestY ;
+    int biggestY = 0;
 
     int i = 1;
     foreach ( UMLWidget *widget , widgetList ) {