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

[Oliver Kellogg]

SVN commit 732208 by okellogg:

apply r728591 and r732152 from trunk

 M  +1 -0      ChangeLog  
 M  +8 -6      umbrello/codegenerators/csharpwriter.cpp  
 M  +2 -0      umbrello/umlwidgetcontroller.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #732207:732208
@@ -11,6 +11,7 @@
 * Moving component on diagram results in absurd shape of self-association (147810)
 * Crash when changing the attribute name (147919)
 * Reads XMI exported by version 1.5 but crashes when rereading after saving (147988)
+* Patch: Correct C# constructors (no return type) (150988)
 
 Version 1.5.71
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/csharpwriter.cpp #732207:732208
@@ -499,13 +499,15 @@
             }
         }
 
-        // return type
-        if (op->getTypeName().isEmpty()) {
-            cs << "void ";
+        // return type (unless constructor, destructor)
+        if (!op->isLifeOperation()) {
+            if (op->getTypeName().isEmpty()) {
+                cs << "void ";
+            }
+            else {
+                cs << makeLocalTypeName(op) << " ";
+            }
         }
-        else {
-            cs << makeLocalTypeName(op) << " ";
-        }
 
         // method name
         cs << cleanName(op->getName()) << "(";
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlwidgetcontroller.cpp #732207:732208
@@ -307,6 +307,8 @@
 }
 
 void UMLWidgetController::doMouseDoubleClick(QMouseEvent *) {
+    if (!m_widget || !m_widget->m_pMenu)
+        return;
     m_widget->slotMenuSelection(ListPopupMenu::mt_Properties);
 }