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

[Brian Thomas]

CVS commit by thomas: 

bug fix: correctly implement user ability to change string/vector class characteristics for C++ code generation


  M +11 -2     cppheadercodedocument.cpp   1.13


--- kdesdk/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp  #1.12:1.13
@@ -350,7 +350,16 @@ void CPPHeaderCodeDocument::updateConten
         //    don't slow down or anything. (TZ)
         QString includeStatement = "";
-        includeStatement.append("include "+policy->getStringClassNameInclude()+";"+endLine);
+        bool stringGlobal = policy->stringIncludeIsGlobal();
+        QString sStartBrak = stringGlobal ? "<" : "\"";
+        QString sEndBrak = stringGlobal ? ">" : "\"";
+        includeStatement.append("include "+sStartBrak+policy->getStringClassNameInclude()+sEndBrak+";"+endLine);
         if ( hasObjectVectorClassFields() )
-                includeStatement.append("include "+policy->getVectorClassNameInclude()+";"+endLine);
+        {
+                bool vecGlobal = policy->vectorIncludeIsGlobal();
+                QString vStartBrak = vecGlobal ? "<" : "\"";
+                QString vEndBrak = vecGlobal ? ">" : "\"";
+                QString value ="include "+vStartBrak+policy->getVectorClassNameInclude()+vEndBrak+";";
+                includeStatement.append(value+endLine);
+        }
 
         //only include classes in a different package from this class