[Uml-devel] kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

use pre-increment over post-increment


  M +2 -1      classimport.cpp   1.49
  M +1 -1      pluginloader.cpp   1.5
  M +4 -4      codegenerators/cppcodegenerationpolicy.cpp   1.11


--- kdesdk/umbrello/umbrello/classimport.cpp  #1.48:1.49
@@ -230,6 +230,7 @@ void ClassImport::importCPP(QStringList 
 
                 QStringList::Iterator end(includes.end());
-                for (QStringList::Iterator i(includes.begin()); i != end; i++)
+                for (QStringList::Iterator i(includes.begin()); i != end; ++i) {
                         m_driver->addIncludePath( *i );
+                }
 
         }

--- kdesdk/umbrello/umbrello/pluginloader.cpp  #1.4:1.5
@@ -161,5 +161,5 @@ PluginLoader::slotDestroyed(QObject *obj
 
   PluginMap::iterator end(_plugins.end());
-  for(PluginMap::iterator i = _plugins.begin(); i != end; i++) {
+  for(PluginMap::iterator i = _plugins.begin(); i != end; ++i) {
     Plugin *p = i.data();
     if(p == plugin) {

--- kdesdk/umbrello/umbrello/codegenerators/cppcodegenerationpolicy.cpp  #1.10:1.11
@@ -35,5 +35,5 @@ const char * CPPCodeGenerationPolicy::DE
 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 }";
+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 }";
 const char * CPPCodeGenerationPolicy::DEFAULT_VECTOR_METHOD_INIT = ""; // nothing to do in std::vector 
 const char * CPPCodeGenerationPolicy::DEFAULT_OBJECT_METHOD_INIT = "%VARNAME% = new %ITEMCLASS%( );";