[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 1279522 by okellogg:

Apply attachment 30830 :

Quoting comment #1,
> Adds "void" behind the return comment element if no return type is
> given.

BUG: 155382


 M  +2 -1      ChangeLog  
 M  +7 -1      umbrello/codegenerators/php/php5writer.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #1279521:1279522
@@ -1,5 +1,7 @@
 Version (since 2012-01-01)
 
+* Enabling of cut/copy/paste actions is incorrect (70925)
+* Illegal tag without any parameter is generated (155382)
 * Loading existing XMI file (194897) and therefore also
   -  umbrello (2.4.2) crashed while opening solid_design.xmi (233705)
 * Generation of classes from files in folder in umbrello (197137)
@@ -16,7 +18,6 @@
   - Umbrello crashes during cut and paste class diagram (257584) 
 * Color of role text on diagram (e.g. Role B) nearly invisible (291401)
 * Copy/Paste of activity, state and use case diagram elements do not create new elements (291557)
-* Enabling of cut/copy/paste actions is incorrect (70925)
 * New feature: C# code import added.
 * New feature: Drawing of state diagrams with more pseudostates possible.
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/php/php5writer.cpp #1279521:1279522
@@ -3022,6 +3022,8 @@
         str.replace(QRegExp("%filename%"),fileName);
         str.replace(QRegExp("%filepath%"),filephp.fileName());
         php<<str<<m_endl;
+    } else {
+        php << "<?php" << m_endl;
     }
 
     //write includes
@@ -3233,7 +3235,11 @@
                     php << ' ' + formatDoc(at->doc(),"") << m_endl;
                 }
             }//end for : write parameter documentation
-            php << m_indentation << " * @return " << op->getTypeName() << m_endl;
+            QString str = op->getTypeName();
+            if (str.isEmpty()) {
+                str = QString("void");
+            }
+            php << m_indentation << " * @return " << str << m_endl;
             if (op->isAbstract()) php << m_indentation << " * @abstract" << m_endl;
             if (op->isStatic()) php << m_indentation << " * @static" << m_endl;
             switch(op->visibility()) {