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

[David Faure]

SVN commit 652654 by dfaure:

Don't make it look like a typo, tell the developer about his error clearly instead.


 M  +4 -2      combinedfragmentwidget.cpp  
 M  +4 -1      objectnodewidget.cpp  
 M  +2 -2      toolbarstateonewidget.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/combinedfragmentwidget.cpp #652653:652654
@@ -227,9 +227,11 @@
         return (CombinedFragmentWidget::Ass);
     if(type == "Alternative")
         return (CombinedFragmentWidget::Alt);
-//    if(type == "Parallel")
+    if(type == "Parallel")
         return (CombinedFragmentWidget::Par);
-
+    // Shouldn't happen
+    Q_ASSERT(0);
+    return (CombinedFragmentWidget::Ref);
 }
 
 void CombinedFragmentWidget::setCombinedFragmentType( QString combinedfragmentType ) {
--- trunk/KDE/kdesdk/umbrello/umbrello/objectnodewidget.cpp #652653:652654
@@ -163,8 +163,11 @@
        return ObjectNodeWidget::Buffer;
     if (objectNodeType == "Data store")
        return ObjectNodeWidget::Data;
-//    if (objectNodeType == "Object Flow")
+    if (objectNodeType == "Object Flow")
        return ObjectNodeWidget::Flow;
+    // Shouldn't happen
+    Q_ASSERT(0);
+    return ObjectNodeWidget::Flow;
 }
 
 void ObjectNodeWidget::setObjectNodeType( ObjectNodeType objectNodeType ) {
--- trunk/KDE/kdesdk/umbrello/umbrello/toolbarstateonewidget.cpp #652653:652654
@@ -145,8 +145,8 @@
     if (getButton() == WorkToolBar::tbb_Pin) {
         return Uml::wt_Pin;
     }
-
-    //return something
+    // Shouldn't happen
+    Q_ASSERT(0);
     return Uml::wt_Pin;
 }