Rename objman.h/cpp -> object_manger.h/cpp

src/CMakeLists.txt

@@ -160,7 +160,7 @@ set(BASE_SOURCES
     object/object.cpp
     object/object_factory.cpp
     object/robotmain.cpp
-    object/objman.cpp
+    object/object_manager.cpp
     object/task/task.cpp
     object/task/taskadvance.cpp
     object/task/taskbuild.cpp

src/app/app.cpp

@@ -38,7 +38,7 @@
 #include "graphics/opengl/glutil.h"
 
 #include "object/robotmain.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 
 #ifdef OPENAL_SOUND
     #include "sound/oalsound/alsound.h"

src/graphics/engine/camera.cpp

@@ -31,7 +31,7 @@
 #include "math/geometry.h"
 
 #include "object/object.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 #include "physics/physics.h"

src/graphics/engine/lightning.cpp

@@ -32,7 +32,7 @@
 
 #include "object/object.h"
 #include "object/robotmain.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 
 #include "object/auto/autopara.h"
 

src/graphics/engine/particle.cpp

@@ -33,7 +33,7 @@
 #include "math/geometry.h"
 
 #include "object/object.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 #include <cstring>

src/graphics/engine/pyro.cpp

@@ -31,7 +31,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 #include "object/motion/motionhuman.h"
 

src/object/auto/autobase.cpp

@@ -29,7 +29,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 #include "physics/physics.h"

src/object/auto/autoconvert.cpp

@@ -22,7 +22,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autoderrick.cpp

@@ -24,7 +24,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autodestroyer.cpp

@@ -20,7 +20,7 @@
 
 #include "object/auto/autodestroyer.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autoegg.cpp

@@ -23,7 +23,7 @@
 #include "math/geometry.h"
 
 #include "object/brain.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autoenergy.cpp

@@ -24,7 +24,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autofactory.cpp

@@ -25,7 +25,7 @@
 #include "math/geometry.h"
 
 #include "object/brain.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"

src/object/auto/automush.cpp

@@ -20,7 +20,7 @@
 
 #include "object/auto/automush.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autonest.cpp

@@ -22,7 +22,7 @@
 
 #include "graphics/engine/terrain.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autonuclear.cpp

@@ -22,7 +22,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autopara.cpp

@@ -23,7 +23,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autoradar.cpp

@@ -22,7 +22,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 
 #include "ui/interface.h"
 #include "ui/window.h"

src/object/auto/autorepair.cpp

@@ -20,7 +20,7 @@
 
 #include "object/auto/autorepair.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/auto/autosafe.cpp

@@ -22,7 +22,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"

src/object/auto/autostation.cpp

@@ -25,7 +25,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 
 #include "ui/interface.h"
 #include "ui/gauge.h"

src/object/auto/autotower.cpp

@@ -22,7 +22,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 

src/object/object.cpp

@@ -43,7 +43,7 @@
 #include "object/motion/motion.h"
 #include "object/motion/motionvehicle.h"
 #include "object/robotmain.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/level/parserline.h"
 #include "object/level/parserparam.h"
 #include "object/level/parserexceptions.h"

src/object/object_manager.cpp

@@ -17,7 +17,7 @@
  * along with this program. If not, see http://gnu.org/licenses
  */
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 
 
 #include "math/all.h"

src/object/object_manager.h

@@ -18,7 +18,7 @@
  */
 
 /**
- * \file object/objman.h
+ * \file object/object_manager.h
  * \brief Object manager
  */
 

src/object/robotmain.cpp

@@ -64,7 +64,7 @@
 #include "object/motion/motionhuman.h"
 #include "object/motion/motiontoto.h"
 #include "object/object.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/task/task.h"
 #include "object/task/taskbuild.h"
 #include "object/task/taskmanip.h"

src/object/task/taskbuild.cpp

@@ -30,7 +30,7 @@
 
 #include "object/auto/auto.h"
 #include "object/motion/motionhuman.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 #include "physics/physics.h"

src/object/task/taskdeletemark.cpp

@@ -24,7 +24,7 @@
 #include "graphics/engine/particle.h"
 #include "graphics/engine/terrain.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 #include "math/geometry.h"

src/object/task/taskflag.cpp

@@ -26,7 +26,7 @@
 #include "graphics/engine/pyro.h"
 #include "graphics/engine/water.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/motion/motionhuman.h"
 
 #include "physics/physics.h"

src/object/task/taskgoto.cpp

@@ -29,7 +29,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 
 #include "physics/physics.h"
 

src/object/task/taskinfo.cpp

@@ -22,7 +22,7 @@
 
 #include "graphics/engine/particle.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/auto/autoinfo.h"
 
 #include <string.h>

src/object/task/taskmanip.cpp

@@ -25,7 +25,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 #include "physics/physics.h"

src/object/task/taskrecover.cpp

@@ -28,7 +28,7 @@
 
 #include "physics/physics.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 

src/object/task/taskreset.cpp

@@ -21,7 +21,7 @@
 #include "object/task/taskreset.h"
 
 #include "object/brain.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 

src/object/task/tasksearch.cpp

@@ -25,7 +25,7 @@
 
 #include "math/geometry.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 #include "physics/physics.h"

src/object/task/taskshield.cpp

@@ -27,7 +27,7 @@
 #include "math/geometry.h"
 
 #include "object/brain.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 #include "physics/physics.h"

src/object/task/tasktake.cpp

@@ -26,7 +26,7 @@
 #include "math/geometry.h"
 
 #include "object/motion/motionhuman.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 
 #include "physics/physics.h"

src/object/task/taskterraform.cpp

@@ -29,7 +29,7 @@
 #include "math/geometry.h"
 
 #include "object/brain.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 #include "object/motion/motionant.h"
 #include "object/motion/motionspider.h"

src/physics/physics.cpp

@@ -35,7 +35,7 @@
 #include "math/geometry.h"
 
 #include "object/brain.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 #include "object/motion/motion.h"
 #include "object/motion/motionhuman.h"

src/script/scriptfunc.cpp

@@ -34,7 +34,7 @@
 
 #include "object/brain.h"
 #include "object/object.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 #include "object/task/taskmanager.h"
 

src/ui/displayinfo.cpp

@@ -32,7 +32,7 @@
 #include "graphics/engine/particle.h"
 
 #include "object/object.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/robotmain.h"
 #include "object/motion/motion.h"
 #include "object/motion/motiontoto.h"

src/ui/displaytext.cpp

@@ -29,7 +29,7 @@
 #include "graphics/engine/engine.h"
 
 #include "object/object.h"
-#include "object/objman.h"
+#include "object/object_manager.h"
 #include "object/motion/motion.h"
 #include "object/motion/motiontoto.h"
 

src/ui/mainshort.cpp

@@ -22,7 +22,7 @@
 
 #include "app/app.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 
 
 namespace Ui {

src/ui/target.cpp

@@ -20,7 +20,7 @@
 
 #include "ui/target.h"
 
-#include "object/objman.h"
+#include "object/object_manager.h"
 
 
 namespace Ui {