Changeset 9357 in orxonox.OLD for branches/proxy/src/lib

Timestamp:

Jul 20, 2006, 2:33:37 PM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: removed 'using namespace std;' everywhere

Location:

branches/proxy/src/lib

Files:

• collision_detection/aabb.cc (modified) (1 diff)
• collision_detection/aabb_tree_node.cc (modified) (1 diff)
• collision_detection/bounding_sphere.cc (modified) (1 diff)
• collision_detection/bounding_volume.cc (modified) (1 diff)
• collision_detection/bv_tree.cc (modified) (1 diff)
• collision_detection/bv_tree_node.cc (modified) (1 diff)
• collision_detection/cd_engine.cc (modified) (1 diff)
• collision_detection/obb.cc (modified) (1 diff)
• collision_detection/obb_tree.cc (modified) (1 diff)
• collision_detection/obb_tree_node.cc (modified) (1 diff)
• collision_reaction/collision.cc (modified) (1 diff)
• collision_reaction/collision_event.cc (modified) (1 diff)
• collision_reaction/collision_handle.cc (modified) (4 diffs)
• collision_reaction/collision_reaction.cc (modified) (1 diff)
• collision_reaction/cr_engine.cc (modified) (4 diffs)
• collision_reaction/cr_object_damage.cc (modified) (1 diff)
• collision_reaction/cr_physics_full_walk.cc (modified) (1 diff)
• collision_reaction/cr_physics_ground_walk.cc (modified) (1 diff)
• event/key_mapper.cc (modified) (1 diff)
• graphics/effects/atmospheric_engine.cc (modified) (1 diff)
• graphics/effects/cloud_effect.cc (modified) (1 diff)
• graphics/effects/fog_effect.cc (modified) (1 diff)
• graphics/effects/graphics_effect.cc (modified) (1 diff)
• graphics/effects/lense_flare.cc (modified) (1 diff)
• graphics/effects/lightning_effect.cc (modified) (1 diff)
• graphics/effects/rain_effect.cc (modified) (1 diff)
• graphics/effects/sun_effect.cc (modified) (1 diff)
• graphics/effects/volfog_effect.cc (modified) (1 diff)
• graphics/effects/weather_effect.cc (modified) (1 diff)
• graphics/importer/bsp_file.cc (modified) (2 diffs)
• graphics/importer/grid.cc (modified) (1 diff)
• graphics/importer/interactive_model.cc (modified) (1 diff)
• graphics/importer/md2/md2Model.cc (modified) (1 diff)
• graphics/importer/md3/md3_animation_cfg.cc (modified) (1 diff)
• graphics/importer/model.cc (modified) (1 diff)
• graphics/importer/primitive_model.cc (modified) (1 diff)
• graphics/importer/static_model.cc (modified) (3 diffs)
• graphics/importer/vertex_array_model.cc (modified) (1 diff)
• graphics/render2D/image_plane.cc (modified) (1 diff)
• graphics/render2D/render_2d.cc (modified) (1 diff)
• graphics/shader.cc (modified) (1 diff)
• graphics/spatial_separation/quadtree.cc (modified) (1 diff)
• graphics/spatial_separation/quadtree_node.cc (modified) (1 diff)
• graphics/spatial_separation/spatial_separation.cc (modified) (1 diff)
• graphics/text_engine/text_engine.cc (modified) (3 diffs)
• gui/gl/glmenu/glmenu_imagescreen.cc (modified) (1 diff)
• gui/gtk/gui.h (modified) (1 diff)
• gui/gtk/gui_element.cc (modified) (1 diff)
• gui/gtk/gui_exec.h (modified) (1 diff)
• gui/gtk/gui_gtk.cc (modified) (1 diff)
• gui/gtk/gui_update.cc (modified) (1 diff)
• gui/gtk/gui_update.h (modified) (1 diff)
• lang/class_list.cc (modified) (9 diffs)
• math/line.cc (modified) (1 diff)
• math/plane.cc (modified) (1 diff)
• math/rotation_OBSOLETE.cc (modified) (1 diff)
• math/vector2D.cc (modified) (1 diff)
• network/converter.cc (modified) (1 diff)
• network/data_stream.cc (modified) (1 diff)
• network/message_manager.cc (modified) (1 diff)
• network/monitor/connection_monitor.cc (modified) (1 diff)
• network/network_game_manager.cc (modified) (1 diff)
• network/network_manager.cc (modified) (1 diff)
• network/network_protocol.cc (modified) (1 diff)
• network/network_stream.cc (modified) (1 diff)
• network/peer_info.cc (modified) (1 diff)
• network/proxy/proxy_settings.cc (modified) (1 diff)
• network/shared_network_data.cc (modified) (1 diff)
• parser/cmdline_parser/cmdline_parser.cc (modified) (1 diff)
• parser/ini_parser/ini_parser.cc (modified) (3 diffs)
• parser/preferences/cmd_line_prefs_reader.cc (modified) (1 diff)
• parser/preferences/ini_file_prefs_reader.cc (modified) (1 diff)
• particles/box_emitter.cc (modified) (1 diff)
• particles/dot_emitter.cc (modified) (1 diff)
• particles/dot_particles.cc (modified) (1 diff)
• particles/engine/particle_engine.cc (modified) (1 diff)
• particles/model_particles.cc (modified) (1 diff)
• particles/particle_emitter.cc (modified) (1 diff)
• particles/particle_system.cc (modified) (1 diff)
• particles/plane_emitter.cc (modified) (1 diff)
• particles/quick_animation.cc (modified) (1 diff)
• particles/spark_particles.cc (modified) (1 diff)
• particles/sprite_particles.cc (modified) (1 diff)
• physics/fields/field.cc (modified) (1 diff)
• physics/fields/gravity.cc (modified) (1 diff)
• physics/fields/point_gravity.cc (modified) (1 diff)
• physics/fields/twirl.cc (modified) (1 diff)
• physics/physics_connection.cc (modified) (1 diff)
• physics/physics_engine.cc (modified) (5 diffs)
• physics/physics_interface.cc (modified) (1 diff)
• util/helper_functions.cc (modified) (1 diff)
• util/loading/dynamic_loader.cc (modified) (1 diff)
• util/loading/factory.cc (modified) (1 diff)
• util/loading/resource.cc (modified) (1 diff)
• util/loading/resource_manager.cc (modified) (1 diff)
• util/threading.cc (modified) (1 diff)

branches/proxy/src/lib/collision_detection/aabb.cc

@@ -19 +19 @@
 #include "vector.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_detection/aabb_tree_node.cc

@@ -34 +34 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_detection/bounding_sphere.cc

@@ -18 +18 @@
 #include "bounding_sphere.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_detection/bounding_volume.cc

@@ -18 +18 @@
 #include "bounding_volume.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_detection/bv_tree.cc

@@ -18 +18 @@
 #include "bv_tree.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_detection/bv_tree_node.cc

@@ -18 +18 @@
 #include "bv_tree_node.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_detection/cd_engine.cc

@@ -34 +34 @@
 #include "bsp_entity.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_detection/obb.cc

@@ -19 +19 @@
 #include "vector.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_detection/obb_tree.cc

@@ -25 +25 @@
 #include "p_node.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_detection/obb_tree_node.cc

@@ -33 +33 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_reaction/collision.cc

@@ -19 +19 @@
 #include "debug.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_reaction/collision_event.cc

@@ -19 +19 @@
 #include "debug.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_reaction/collision_handle.cc

@@ -29 +29 @@
 #include "debug.h"
 
-using namespace std;
+
 
 
@@ -204 +204 @@
 
   // collision reaction calculations (for every collision there will be a reaction)
-  vector<Collision*>::iterator it = this->collisionList.begin();
+  std::vector<Collision*>::iterator it = this->collisionList.begin();
   for(; it < this->collisionList.end(); it++) {
     if( !(*it)->isDispatched())
@@ -227 +227 @@
 bool CollisionHandle::filterCollisionEvent(CollisionEvent* collisionEvent)
 {
-  vector<long>::iterator it = this->targetList.begin();
+  std::vector<long>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
   {
@@ -276 +276 @@
 bool CollisionHandle::filterCollision(Collision* collision)
 {
-  vector<long>::iterator it = this->targetList.begin();
+  std::vector<long>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
   {

branches/proxy/src/lib/collision_reaction/collision_reaction.cc

@@ -19 +19 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_reaction/cr_engine.cc

@@ -27 +27 @@
 #include "debug.h"
 
-using namespace std;
+
 
 
@@ -61 +61 @@
   this->reset();
 
-  vector<Collision*>::iterator it1 = this->collisionsUnused.begin();
+  std::vector<Collision*>::iterator it1 = this->collisionsUnused.begin();
   for(; it1 < this->collisionsUnused.end(); it1++)
     delete *it1;
-  vector<CollisionEvent*>::iterator it2 = this->collisionEventsUnused.begin();
+  std::vector<CollisionEvent*>::iterator it2 = this->collisionEventsUnused.begin();
   for(; it2 < this->collisionEventsUnused.end(); it2++)
     delete *it2;
@@ -92 +92 @@
   // first clear all CollisionHandles
 
-  vector<CollisionHandle*>::iterator it = this->collisionHandles.begin();
+  std::vector<CollisionHandle*>::iterator it = this->collisionHandles.begin();
   for(; it < this->collisionHandles.end(); it++)
   {
@@ -159 +159 @@
 void CREngine::flushCollisions()
 {
-  vector<Collision*>::iterator it1 = this->collisionsUsed.begin();
+  std::vector<Collision*>::iterator it1 = this->collisionsUsed.begin();
   for(; it1 < this->collisionsUsed.end(); it1++)
     this->collisionsUnused.push_back(*it1);
 
-  vector<CollisionEvent*>::iterator it2 = this->collisionEventsUsed.begin();
+  std::vector<CollisionEvent*>::iterator it2 = this->collisionEventsUsed.begin();
   for(; it2 < this->collisionEventsUsed.end(); it2++)
     this->collisionEventsUnused.push_back(*it2);

branches/proxy/src/lib/collision_reaction/cr_object_damage.cc

@@ -26 +26 @@
 #include "debug.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_reaction/cr_physics_full_walk.cc

@@ -33 +33 @@
 #include "cr_defs.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -33 +33 @@
 #include "cr_defs.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/event/key_mapper.cc

@@ -31 +31 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/graphics/effects/atmospheric_engine.cc

@@ -25 +25 @@
 
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/graphics/effects/cloud_effect.cc

@@ -40 +40 @@
 float     CloudEffect::fadeTime;
 
-using namespace std;
+
 
 SHELL_COMMAND(activate, CloudEffect, activateCloud);

branches/proxy/src/lib/graphics/effects/fog_effect.cc

@@ -28 +28 @@
 SHELL_COMMAND(fadeout, FogEffect, fadeOutFog);
 
-using namespace std;
+
 
 CREATE_SCRIPTABLE_CLASS(FogEffect, CL_FOG_EFFECT,

branches/proxy/src/lib/graphics/effects/graphics_effect.cc

@@ -23 +23 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/graphics/effects/lense_flare.cc

@@ -34 +34 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/graphics/effects/lightning_effect.cc

@@ -34 +34 @@
 SHELL_COMMAND(deactivate, LightningEffect, deactivateLightning);
 
-using namespace std;
+
 
 CREATE_SCRIPTABLE_CLASS(LightningEffect, CL_LIGHTNING_EFFECT,

branches/proxy/src/lib/graphics/effects/rain_effect.cc

@@ -39 +39 @@
 SHELL_COMMAND(stopraining, RainEffect, stopRaining);
 
-using namespace std;
+
 
 CREATE_SCRIPTABLE_CLASS(RainEffect, CL_RAIN_EFFECT,

branches/proxy/src/lib/graphics/effects/sun_effect.cc

@@ -21 +21 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/graphics/effects/volfog_effect.cc

@@ -47 +47 @@
 
 
-using namespace std;
+
 
 CREATE_FACTORY(VolFogEffect, CL_VOLFOG_EFFECT);

branches/proxy/src/lib/graphics/effects/weather_effect.cc

@@ -21 +21 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/graphics/importer/bsp_file.cc

@@ -40 +40 @@
 #include <vector>
 
-using namespace std;
+
 
 
@@ -96 +96 @@
   if (stat( name , &results) == 0) {
     PRINTF(0)("BSP FILE: Datei %s gefunden. \n", name);
-    ifstream bspFile (name, ios::in | ios::binary);
+    std::ifstream bspFile (name, std::ios::in | std::ios::binary);
     bspFile.read(this->header, 260);
     PRINTF(0)("BSP FILE: BSPVersion: %i. \n", ((int *)(header) )[1]);

branches/proxy/src/lib/graphics/importer/grid.cc

@@ -18 +18 @@
 #include "grid.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/graphics/importer/interactive_model.cc

@@ -20 +20 @@
 #include "glincl.h"
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/graphics/importer/md2/md2Model.cc

@@ -22 +22 @@
 
 
-using namespace std;
+
 
 //! the model anorms

branches/proxy/src/lib/graphics/importer/md3/md3_animation_cfg.cc

@@ -26 +26 @@
 
 
-using namespace std;
+
 
 namespace md3

branches/proxy/src/lib/graphics/importer/model.cc

@@ -20 +20 @@
 #include "glincl.h"
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/graphics/importer/primitive_model.cc

@@ -21 +21 @@
 #include "debug.h"
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/graphics/importer/static_model.cc

@@ -23 +23 @@
 #include <stdarg.h>
 
-using namespace std;
+
 
 
@@ -178 +178 @@
 
   //! @todo do we really have to delete this material??
-  list<ModelMaterial*>::iterator modMat;
+  std::list<ModelMaterial*>::iterator modMat;
   for(modMat = this->materialList.begin(); modMat != this->materialList.end(); modMat++)
   {
@@ -358 +358 @@
 Material* StaticModel::findMaterialByName(const std::string& materialName)
 {
-  list<ModelMaterial*>::iterator modMat;
+  std::list<ModelMaterial*>::iterator modMat;
   for  (modMat = this->materialList.begin(); modMat != this->materialList.end(); modMat++)
     if (materialName == (*modMat)->material->getName())

branches/proxy/src/lib/graphics/importer/vertex_array_model.cc

@@ -23 +23 @@
 #include "tc.h"
 
-using namespace std;
+
 
 /////////////

branches/proxy/src/lib/graphics/render2D/image_plane.cc

@@ -25 +25 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/graphics/render2D/render_2d.cc

@@ -22 +22 @@
 #include "element_2d.h"
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/graphics/shader.cc

@@ -32 +32 @@
 #endif
 
-using namespace std;
+
 
 

branches/proxy/src/lib/graphics/spatial_separation/quadtree.cc

@@ -24 +24 @@
 #include "debug.h"
 
-using namespace std;
+
 #define QUADTREE_MATERIAL_COUNT       4
 

branches/proxy/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -26 +26 @@
 #include "util/list.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/graphics/spatial_separation/spatial_separation.cc

@@ -23 +23 @@
 #include "compiler.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/graphics/text_engine/text_engine.cc

@@ -26 +26 @@
 #include "font.h"
 
-using namespace std;
+
 
 #include <stdlib.h>
@@ -122 +122 @@
 void TextEngine::debug() const
 {
-  const list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
+  const std::list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
   if (textList != NULL)
   {
@@ -130 +130 @@
     PRINT(0)("Reference: %p; Text Counts: %d\n", this, textList->size());
 
-    list<BaseObject*>::const_iterator text;
+    std::list<BaseObject*>::const_iterator text;
     for ( text = textList->begin(); text != textList->end(); text++)
       dynamic_cast<Text*>(*text)->debug();

branches/proxy/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc

@@ -27 +27 @@
 CREATE_FACTORY(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
 
-using namespace std;
+
 /**
  * @param root The Element to load the GLMenu from

branches/proxy/src/lib/gui/gtk/gui.h

@@ -14 +14 @@
 #define _GUI_H
 
-using namespace std;
+
 
 #define GUI_DEFAULT_CONF_DIR "~/.orxonox"

branches/proxy/src/lib/gui/gtk/gui_element.cc

@@ -20 +20 @@
 #include "gui_gtk.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/gui/gtk/gui_exec.h

@@ -15 +15 @@
 class Widget;
 class CheckButton;
-using namespace std;
+
 class IniParser;
 

branches/proxy/src/lib/gui/gtk/gui_gtk.cc

@@ -32 +32 @@
 #include <cmath>
 
-using namespace std;
+
 
 #include "gui_flags.h"

branches/proxy/src/lib/gui/gtk/gui_update.cc

@@ -31 +31 @@
 #include "globals.h"
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/gui/gtk/gui_update.h

@@ -24 +24 @@
 #include <pthread.h>
 #endif /* HAVE_PTHREAD_H */
-using namespace std;
+
 
 //! Class that creates the execute-Options.

branches/proxy/src/lib/lang/class_list.cc

@@ -23 +23 @@
 #include <cmath>
 
-using namespace std;
+
 
 /**
@@ -61 +61 @@
 {
   if (unlikely(classList == NULL))
-    ClassList::classList = new list<ClassList>();
+    ClassList::classList = new std::list<ClassList>();
 
   PRINTF(5)("subscribe a '%s'\n", className.c_str() );
@@ -85 +85 @@
 void ClassList::removeFromClassList(BaseObject* objectPointer)
 {
-  list<ClassList>::iterator cl;
+  std::list<ClassList>::iterator cl;
   for(cl = ClassList::classList->begin(); cl != ClassList::classList->end(); cl++)
   {
@@ -110 +110 @@
       ClassList::classNames.clear();
 
-      list<ClassList>::const_iterator cl;
+      std::list<ClassList>::const_iterator cl;
       for (cl = ClassList::classList->begin(); cl != ClassList::classList->end(); cl++)
         ClassList::classNames.push_back((*cl).className);
@@ -213 +213 @@
   else
   {
-    list<ClassList>::iterator cl;
+    std::list<ClassList>::iterator cl;
     for (cl = ClassList::classList->begin(); cl != ClassList::classList->end(); cl++)
     {
@@ -268 +268 @@
   else
   {
-    list<ClassList>::iterator cl;
+    std::list<ClassList>::iterator cl;
     for (cl = ClassList::classList->begin(); cl != ClassList::classList->end(); cl++)
     {
@@ -299 +299 @@
 void ClassList::whatIs(const BaseObject* object)
 {
-  list<ClassList>::iterator cl;
+  std::list<ClassList>::iterator cl;
   for (cl = ClassList::classList->begin(); cl != ClassList::classList->end(); cl++)
     if (object->isA((*cl).classID))
@@ -359 +359 @@
   int lenCount = 0;
 
-  list<ClassList>::iterator cl;
+  std::list<ClassList>::iterator cl;
   for (cl = ClassList::classList->begin(); cl != ClassList::classList->end(); cl++)
   {
@@ -377 +377 @@
       {
         PRINT(0)("|  Listing Instances:\n");
-        list<BaseObject*>::const_iterator bo;
+        std::list<BaseObject*>::const_iterator bo;
         for (bo = (*cl).objectList.begin(); bo != (*cl).objectList.end(); bo++)
         {

branches/proxy/src/lib/math/line.cc

@@ -26 +26 @@
 #endif
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/math/plane.cc

@@ -24 +24 @@
 #endif
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/math/rotation_OBSOLETE.cc

@@ -24 +24 @@
 #endif
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/math/vector2D.cc

@@ -27 +27 @@
 #endif
 
-using namespace std;
+
 
 /////////////

branches/proxy/src/lib/network/converter.cc

@@ -30 +30 @@
 
 /* using namespace std is default, this needs to be here */
-using namespace std;
+
 
 /*!

branches/proxy/src/lib/network/data_stream.cc

@@ -19 +19 @@
 
 /* using namespace std is default, this needs to be here */
-using namespace std;
+
 
 

branches/proxy/src/lib/network/message_manager.cc

@@ -21 +21 @@
 #include "shared_network_data.h"
 
-using namespace std;
+
 
 MessageManager* MessageManager::singletonRef = NULL;

branches/proxy/src/lib/network/monitor/connection_monitor.cc

@@ -22 +22 @@
 
 /* using namespace std is default, this needs to be here */
-using namespace std;
+
 
 /**

branches/proxy/src/lib/network/network_game_manager.cc

@@ -46 +46 @@
 
 
-using namespace std;
+
 
 NetworkGameManager* NetworkGameManager::singletonRef = NULL;

branches/proxy/src/lib/network/network_manager.cc

@@ -34 +34 @@
 
 /* using namespace std is default, this needs to be here */
-using namespace std;
+
 
 SHELL_COMMAND(debug, NetworkManager, debug);

branches/proxy/src/lib/network/network_protocol.cc

@@ -33 +33 @@
 
 /* using namespace std is default, this needs to be here */
-using namespace std;
+
 
 

branches/proxy/src/lib/network/network_stream.cc

@@ -51 +51 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/network/peer_info.cc

@@ -24 +24 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/network/proxy/proxy_settings.cc

@@ -22 +22 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/network/shared_network_data.cc

@@ -20 +20 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/parser/cmdline_parser/cmdline_parser.cc

@@ -18 +18 @@
 #include "src/lib/util/substring.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/parser/ini_parser/ini_parser.cc

@@ -35 +35 @@
 #endif
 
-using namespace std;
+
 
 /**
@@ -142 +142 @@
       if ( (*lineBegin == '#' || *lineBegin == ';'))
       {
-        string newCommenLine = lineBegin;
+        std::string newCommenLine = lineBegin;
         this->commentList.push_back(newCommenLine);
         continue;
@@ -242 +242 @@
   }
   fclose(stream);
+  return true;
 }
 

branches/proxy/src/lib/parser/preferences/cmd_line_prefs_reader.cc

@@ -20 +20 @@
 #include "preferences.h"
 
-using namespace std;
+
 
 RegistredArgs CmdLinePrefsReader::regArgs;

branches/proxy/src/lib/parser/preferences/ini_file_prefs_reader.cc

@@ -18 +18 @@
 #include "ini_file_prefs_reader.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/particles/box_emitter.cc

@@ -25 +25 @@
 #include "stdlibincl.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/particles/dot_emitter.cc

@@ -24 +24 @@
 #include "debug.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/particles/dot_particles.cc

@@ -33 +33 @@
     ->defaultValues("maps/evil-flower.png");
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/particles/engine/particle_engine.cc

@@ -24 +24 @@
 #include "util/loading/load_param.h"
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/particles/model_particles.cc

@@ -33 +33 @@
 ->defaultValues("maps/evil-flower.png");
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/particles/particle_emitter.cc

@@ -24 +24 @@
 #include "stdlibincl.h"
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/particles/particle_system.cc

@@ -32 +32 @@
 #include <algorithm>
 
-using namespace std;
+
 /**
  *  standard constructor

branches/proxy/src/lib/particles/plane_emitter.cc

@@ -25 +25 @@
 #include "stdlibincl.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/particles/quick_animation.cc

@@ -20 +20 @@
 #include <algorithm>
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/particles/spark_particles.cc

@@ -29 +29 @@
 
 
-using namespace std;
+
 
 CREATE_FACTORY(SparkParticles, CL_SPARK_PARTICLES);

branches/proxy/src/lib/particles/sprite_particles.cc

@@ -33 +33 @@
     ->defaultValues("maps/evil-flower.png");
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/physics/fields/field.cc

@@ -22 +22 @@
 #include "util/loading/factory.h"
 #include "util/loading/load_param.h"
-using namespace std;
+
 
 /**

branches/proxy/src/lib/physics/fields/gravity.cc

@@ -21 +21 @@
 #include "util/loading/factory.h"
 
-using namespace std;
+
 
 CREATE_FACTORY(Gravity, CL_FIELD_GRAVITY);

branches/proxy/src/lib/physics/fields/point_gravity.cc

@@ -18 +18 @@
 #include "point_gravity.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/physics/fields/twirl.cc

@@ -18 +18 @@
 #include "twirl.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/physics/physics_connection.cc

@@ -27 +27 @@
 #include "util/loading/load_param.h"
 
-using namespace std;
+
 
 CREATE_FACTORY(PhysicsConnection, CL_PHYSICS_CONNECTION);

branches/proxy/src/lib/physics/physics_engine.cc

@@ -23 +23 @@
 #include "util/loading/load_param.h"
 
-using namespace std;
+
 
 
@@ -162 +162 @@
 Field* PhysicsEngine::getFieldByName(const std::string& fieldName) const
 {
-  list<Field*>::const_iterator field;
+  std::list<Field*>::const_iterator field;
   for (field = this->fields.begin(); field != this->fields.end(); field++)
     if (fieldName == (*field)->getName())
@@ -199 +199 @@
 PhysicsConnection* PhysicsEngine::getPhysicsConnectionByName(const std::string& physicsConnectionName) const
 {
-  list<PhysicsConnection*>::const_iterator pc;
+  std::list<PhysicsConnection*>::const_iterator pc;
   for (pc = this->connections.begin(); pc != this->connections.end(); pc++)
     if (physicsConnectionName == (*pc)->getName())
@@ -218 +218 @@
   /* go through all the PhysicsInterface(s) and tick them,
   meaning let the fields work */
-  list<PhysicsConnection*>::iterator pc;
+  std::list<PhysicsConnection*>::iterator pc;
   for (pc = this->connections.begin(); pc != this->connections.end(); pc++)
     (*pc)->apply();
@@ -225 +225 @@
   if (this->interfaces != NULL || (this->interfaces = ClassList::getList(CL_PHYSICS_INTERFACE)) != NULL)
   {
-    list<BaseObject*>::const_iterator tickPhys;
+    std::list<BaseObject*>::const_iterator tickPhys;
     for (tickPhys = this->interfaces->begin(); tickPhys != this->interfaces->end(); tickPhys++)
       dynamic_cast<PhysicsInterface*>(*tickPhys)->tickPhys(dt);

branches/proxy/src/lib/physics/physics_interface.cc

@@ -29 +29 @@
 #include "stdincl.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/util/helper_functions.cc

@@ -19 +19 @@
 #include "stdlibincl.h"
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/util/loading/dynamic_loader.cc

@@ -23 +23 @@
 
 
-using namespace std;
+
 
 

branches/proxy/src/lib/util/loading/factory.cc

@@ -19 +19 @@
 //#include "shell_command.h"
 
-using namespace std;
+
 
 //SHELL_COMMAND(create, Factory, fabricate);

branches/proxy/src/lib/util/loading/resource.cc

@@ -18 +18 @@
 #include "resource.h"
 
-using namespace std;
+
 
 

branches/proxy/src/lib/util/loading/resource_manager.cc

@@ -50 +50 @@
 #include <unistd.h>
 
-using namespace std;
+
 
 /**

branches/proxy/src/lib/util/threading.cc

@@ -18 +18 @@
 #include "threading.h"
 
-using namespace std;
+
 
 namespace OrxThread