[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Patch from Amilcar Lucas to prevent compile errors


  M +1 -0      Makefile.am   1.22
  M +92 -92    codegenerators/cppwriter.cpp   1.12
  M +1 -1      codegenerators/javawriter.cpp   1.14


--- kdesdk/umbrello/umbrello/Makefile.am  #1.21:1.22
@@ -15,4 +15,5 @@
 app_DATA = tips umbrelloui.rc
 
+xdg_appsdir = $(kde_mimedir)/application
 xdg_apps_DATA = umbrello.desktop
 

--- kdesdk/umbrello/umbrello/codegenerators/cppwriter.cpp  #1.11:1.12
@@ -1300,5 +1300,5 @@ QString CppWriter::scopeToCPPDecl(Uml::S
 QString CppWriter::getUMLObjectName(UMLObject *obj)
 {
-        return(obj!=0)?obj->getName():"NULL";
+        return(obj!=0)?obj->getName():QString("NULL");
 }
 

--- kdesdk/umbrello/umbrello/codegenerators/javawriter.cpp  #1.13:1.14
@@ -784,5 +784,5 @@ QString JavaWriter::scopeToJavaDecl(Uml:
 QString JavaWriter::getUMLObjectName(UMLObject *obj)
 {
-        return(obj!=0)?obj->getName():"NULL";
+        return(obj!=0)?obj->getName():QString("NULL");
 }