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

[Stephan Binner]

SVN commit 652653 by binner:

fix random return data


 M  +1 -1      combinedfragmentwidget.cpp  
 M  +1 -1      objectnodewidget.cpp  
 M  +3 -0      toolbarstateonewidget.cpp  
 M  +1 -0      umldoc.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/combinedfragmentwidget.cpp #652652:652653
@@ -227,7 +227,7 @@
         return (CombinedFragmentWidget::Ass);
     if(type == "Alternative")
         return (CombinedFragmentWidget::Alt);
-    if(type == "Parallel")
+//    if(type == "Parallel")
         return (CombinedFragmentWidget::Par);
 
 }
--- trunk/KDE/kdesdk/umbrello/umbrello/objectnodewidget.cpp #652652:652653
@@ -163,7 +163,7 @@
        return ObjectNodeWidget::Buffer;
     if (objectNodeType == "Data store")
        return ObjectNodeWidget::Data;
-    if (objectNodeType == "Object Flow")
+//    if (objectNodeType == "Object Flow")
        return ObjectNodeWidget::Flow;
 }
 
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstateonewidget.cpp #652652:652653
@@ -145,6 +145,9 @@
     if (getButton() == WorkToolBar::tbb_Pin) {
         return Uml::wt_Pin;
     }
+
+    //return something
+    return Uml::wt_Pin;
 }
 
 
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #652652:652653
@@ -999,6 +999,7 @@
             KMessageBox::error(0, i18n("A diagram is already using that name."), i18n("Not a Unique Name"));
         }
     }//end while
+    return 0;
 }
 
 void UMLDoc::renameDiagram(Uml::IDType id) {