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

[Oliver Kellogg]

CVS commit by okellogg: 

Use <string> and <vector> as generated STL includes.


  M +2 -2      cppcodegenerationformbase.ui   1.9
  M +2 -2      cppcodegenerationpolicy.cpp   1.9


--- kdesdk/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui  #1.8:1.9
@@ -426,5 +426,5 @@
                                 <stringlist>
                                     <string>qptrlist.h</string>
-                                    <string>vector.h</string>
+                                    <string>vector</string>
                                 </stringlist>
                             </property>
@@ -459,5 +459,5 @@
                                 <stringlist>
                                     <string>qstring.h</string>
-                                    <string>string.h</string>
+                                    <string>string</string>
                                 </stringlist>
                             </property>

--- kdesdk/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp  #1.8:1.9
@@ -31,7 +31,7 @@ const bool CPPCodeGenerationPolicy::DEFA
 const bool CPPCodeGenerationPolicy::DEFAULT_PACKAGE_IS_NAMESPACE = false;
 const char * CPPCodeGenerationPolicy::DEFAULT_STRING_CLASS_NAME = "string";
-const char * CPPCodeGenerationPolicy::DEFAULT_STRING_CLASS_INCLUDE = "string.h";
+const char * CPPCodeGenerationPolicy::DEFAULT_STRING_CLASS_INCLUDE = "string";
 const char * CPPCodeGenerationPolicy::DEFAULT_VECTOR_CLASS_NAME = "vector";
-const char * CPPCodeGenerationPolicy::DEFAULT_VECTOR_CLASS_INCLUDE = "vector.h";
+const char * CPPCodeGenerationPolicy::DEFAULT_VECTOR_CLASS_INCLUDE = "vector";
 const char * CPPCodeGenerationPolicy::DEFAULT_VECTOR_METHOD_APPEND = "%VARNAME%.push_back(value);";
 const char * CPPCodeGenerationPolicy::DEFAULT_VECTOR_METHOD_REMOVE = "int size = %VARNAME%.size();\nfor ( int i = 0; i < size; i++) {\n\t%ITEMCLASS% item = %VARNAME%.at(i);\n\tif(item == value) {\n\t\tvector<%ITEMCLASS%>::iterator it = %VARNAME%.begin() + i;\n\t\t%VARNAME%.erase(it);\n\t\treturn;\n\t}\n }";