[Pingus-CVS] CVS: Games/Pingus/src/editor editor_event.cxx,1.28,1.29 object_selector.cxx,1.8,1.9 panel.cxx,1.3,1.4 plfobj.cxx,1.7,1.8 string_reader.cxx,1.5,1.6 surface_selector.cxx,1.2,1.3 thumb_cache.cxx,1.7,1.8

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/editor
In directory dark:/tmp/cvs-serv28473/editor

Modified Files:
        editor_event.cxx object_selector.cxx panel.cxx plfobj.cxx 
        string_reader.cxx surface_selector.cxx thumb_cache.cxx 
Log Message:
changed some postfix increments to prefix increments


Index: editor_event.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/editor_event.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- editor_event.cxx    16 Aug 2002 13:03:36 -0000      1.28
+++ editor_event.cxx    17 Aug 2002 17:56:23 -0000      1.29
@@ -399,7 +399,7 @@
 
          for(std::vector<EditorObj*>::iterator i = objs->begin();
              i != objs->end();
-             i++)
+             ++i)
            {
              EditorObj* obj = (*i)->duplicate ();
              if (obj)
@@ -437,11 +437,11 @@
       // We need to collect the objects out of the editor_objs list to keep 
the correct sorting
       for (ObjectManager::EditorObjIter j = 
object_manager->editor_objs.begin();
           j != object_manager->editor_objs.end();
-          j++)
+          ++j)
        {
          for (std::vector<EditorObj*>::const_iterator i = 
selection->get_objects().begin();
               i != selection->get_objects().end();
-              i++)
+              ++i)
            { 
              if (*j == *i)
                {
@@ -453,7 +453,7 @@
 
       for(std::vector<EditorObj*>::iterator i = to_erase.begin();
          i != to_erase.end();
-         i++)
+         ++i)
        object_manager->erase(*i);
 
       object_manager->add (group);
@@ -539,7 +539,7 @@
 
   dir = System::opendir(System::get_statdir() + "levels/", "*");
 
-  for (System::Directory::iterator i = dir.begin(); i != dir.end(); i++)
+  for (System::Directory::iterator i = dir.begin(); i != dir.end(); ++i)
     {
       //std::cout << "dirs: " << System::get_statdir() + "levels/" +  i->name 
<< std::endl;
       
@@ -583,7 +583,7 @@
   // FIXME: *.xml or better switch to CL_DirectoryScanner
   dir = System::opendir(System::get_statdir() + "levels/", "*");
 
-  for (System::Directory::iterator i = dir.begin(); i != dir.end(); i++)
+  for (System::Directory::iterator i = dir.begin(); i != dir.end(); ++i)
     {
       //std::cout << "dirs: " << System::get_statdir() + "levels/" +  i->name 
<< std::endl;
       str = System::get_statdir() + "levels/" + i->name;
@@ -615,7 +615,7 @@
   
   for (std::vector<EditorObj*>::const_iterator i = 
selection->get_objects().begin(); 
        i != selection->get_objects().end();
-       i++)
+       ++i)
     {
       /*ObjectManager::EditorObjIter iter = 
std::find(object_manager->editor_objs.begin(), 
                                                    
object_manager->editor_objs.end(), 
@@ -661,7 +661,7 @@
       
   if (!objs.empty ()) 
     {
-      for (ObjectManager::EditorObjIter i = objs.begin (); i != objs.end (); 
i++)
+      for (ObjectManager::EditorObjIter i = objs.begin (); i != objs.end (); 
++i)
        object_manager->editor_objs.push_back(*i);
     } 
   else 

Index: object_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/object_selector.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- object_selector.cxx 8 Jul 2002 17:05:09 -0000       1.8
+++ object_selector.cxx 17 Aug 2002 17:56:23 -0000      1.9
@@ -575,7 +575,7 @@
   std::vector<surface_obj> sur_list;
   int j = 0;
 
-  for(std::list<string>::iterator i = liste->begin(); i != liste->end(); i++)
+  for(std::list<string>::iterator i = liste->begin(); i != liste->end(); ++i)
     {
       // FIXME: This should be moved to ThumbCache
       ++j;

Index: panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/panel.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- panel.cxx   1 Jul 2002 12:46:22 -0000       1.3
+++ panel.cxx   17 Aug 2002 17:56:23 -0000      1.4
@@ -101,7 +101,7 @@
  
   logo.put_screen(0, CL_Display::get_height() - logo.get_height());
 
-  for (std::vector<PanelIcon*>::iterator i = buttons.begin(); i != 
buttons.end(); i++)
+  for (std::vector<PanelIcon*>::iterator i = buttons.begin(); i != 
buttons.end(); ++i)
     {
       (*i)->put_screen(0, y);
       y += 25;
@@ -146,7 +146,7 @@
       int y = 0;
       // std::cout << "Click" << std::endl;
 
-      for (std::vector<PanelIcon*>::iterator i = buttons.begin(); i != 
buttons.end(); i++)
+      for (std::vector<PanelIcon*>::iterator i = buttons.begin(); i != 
buttons.end(); ++i)
        {
          if (CL_Mouse::get_y() > y && CL_Mouse::get_y() < y + 25)
            {
@@ -165,7 +165,7 @@
     {
       int y = 0;
       
-      for (std::vector<PanelIcon*>::iterator i = buttons.begin(); i != 
buttons.end(); i++)
+      for (std::vector<PanelIcon*>::iterator i = buttons.begin(); i != 
buttons.end(); ++i)
        {
          if (CL_Mouse::get_y() > y && CL_Mouse::get_y() < y + 25)
            {

Index: plfobj.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/plfobj.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- plfobj.cxx  16 Aug 2002 15:14:00 -0000      1.7
+++ plfobj.cxx  17 Aug 2002 17:56:23 -0000      1.8
@@ -209,7 +209,7 @@
 void
 LiquidObj::draw (EditorView * view)
 {
-  for(int i = 0; i < width; i++)
+  for(int i = 0; i < width; ++i)
     view->draw (sprite, pos + CL_Vector (i * sprite.get_width (), 0));
 }
 

Index: string_reader.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/string_reader.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- string_reader.cxx   8 Jul 2002 17:05:09 -0000       1.5
+++ string_reader.cxx   17 Aug 2002 17:56:23 -0000      1.6
@@ -117,12 +117,12 @@
     
   console << "\nCompletions:\n" <<   "~~~~~~~~~~~~" << std::endl;
 
-  for(std::list<std::string>::iterator i = strings->begin(); i != 
strings->end(); i++)
+  for(std::list<std::string>::iterator i = strings->begin(); i != 
strings->end(); ++i)
     {
       if (i->find(current_string) == 0)
        {
          console << *i << std::endl;
-         completions_counter++;
+         ++completions_counter;
          completion = &(*i);
          completions.push_back(&(*i));
        }
@@ -144,7 +144,7 @@
   while (i != completions.end())
     {
       ret_string = while_eq(ret_string, **i);
-      i++;
+      ++i;
     }
 
   return ret_string;
@@ -157,7 +157,7 @@
   
   for(std::string::size_type i = 0;
       i < a.size() && i < b.size() && a[i] == b[i];
-      i++)
+      ++i)
     {
       ret_string += a[i];
     }

Index: surface_selector.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/surface_selector.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- surface_selector.cxx        23 Jun 2002 12:47:50 -0000      1.2
+++ surface_selector.cxx        17 Aug 2002 17:56:24 -0000      1.3
@@ -52,7 +52,7 @@
   
   for(vector<surface_obj>::iterator i = sur_list->begin(); 
       i != sur_list->end(); 
-      i++)
+      ++i)
     {
       if (CL_Mouse::get_x() > x && CL_Mouse::get_x() <= x + 50
          && CL_Mouse::get_y() > y && CL_Mouse::get_y() <= y + 50)
@@ -96,7 +96,7 @@
   CL_Display::clear_display();
 
   // Draw all surfaces
-  for(vector<surface_obj>::iterator i = sur_list->begin(); i != 
sur_list->end(); i++)
+  for(vector<surface_obj>::iterator i = sur_list->begin(); i != 
sur_list->end(); ++i)
     {
       if (i->thumbnail.get_width() <= 50 && i->thumbnail.get_height() <= 50)
        {

Index: thumb_cache.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/editor/thumb_cache.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- thumb_cache.cxx     23 Jun 2002 19:16:42 -0000      1.7
+++ thumb_cache.cxx     17 Aug 2002 17:56:24 -0000      1.8
@@ -63,7 +63,7 @@
 {
   std::string filename = res_ident + "-" + datafile;
 
-  for (unsigned int i = 0; i < filename.size (); i++)
+  for (unsigned int i = 0; i < filename.size (); ++i)
     if (filename[i] == '/')
       filename[i] = '_';
 
@@ -137,7 +137,7 @@
     
   std::string filename = res_ident + "-" + datafile;
 
-  for (unsigned int i = 0; i < filename.size (); i++)
+  for (unsigned int i = 0; i < filename.size (); ++i)
     if (filename[i] == '/')
       filename[i] = '_';