From fed67e664076fb44365fe729405a5ee579ad6c30 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sat, 20 Jun 2015 20:02:40 +0200 Subject: [PATCH] Rename objman.h/cpp -> object_manger.h/cpp --- src/CMakeLists.txt | 2 +- src/app/app.cpp | 2 +- src/graphics/engine/camera.cpp | 2 +- src/graphics/engine/lightning.cpp | 2 +- src/graphics/engine/particle.cpp | 2 +- src/graphics/engine/pyro.cpp | 2 +- src/object/auto/autobase.cpp | 2 +- src/object/auto/autoconvert.cpp | 2 +- src/object/auto/autoderrick.cpp | 2 +- src/object/auto/autodestroyer.cpp | 2 +- src/object/auto/autoegg.cpp | 2 +- src/object/auto/autoenergy.cpp | 2 +- src/object/auto/autofactory.cpp | 2 +- src/object/auto/automush.cpp | 2 +- src/object/auto/autonest.cpp | 2 +- src/object/auto/autonuclear.cpp | 2 +- src/object/auto/autopara.cpp | 2 +- src/object/auto/autoradar.cpp | 2 +- src/object/auto/autorepair.cpp | 2 +- src/object/auto/autosafe.cpp | 2 +- src/object/auto/autostation.cpp | 2 +- src/object/auto/autotower.cpp | 2 +- src/object/object.cpp | 2 +- src/object/{objman.cpp => object_manager.cpp} | 2 +- src/object/{objman.h => object_manager.h} | 2 +- src/object/robotmain.cpp | 2 +- src/object/task/taskbuild.cpp | 2 +- src/object/task/taskdeletemark.cpp | 2 +- src/object/task/taskflag.cpp | 2 +- src/object/task/taskgoto.cpp | 2 +- src/object/task/taskinfo.cpp | 2 +- src/object/task/taskmanip.cpp | 2 +- src/object/task/taskrecover.cpp | 2 +- src/object/task/taskreset.cpp | 2 +- src/object/task/tasksearch.cpp | 2 +- src/object/task/taskshield.cpp | 2 +- src/object/task/tasktake.cpp | 2 +- src/object/task/taskterraform.cpp | 2 +- src/physics/physics.cpp | 2 +- src/script/scriptfunc.cpp | 2 +- src/ui/displayinfo.cpp | 2 +- src/ui/displaytext.cpp | 2 +- src/ui/mainshort.cpp | 2 +- src/ui/target.cpp | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) rename src/object/{objman.cpp => object_manager.cpp} (99%) rename src/object/{objman.h => object_manager.h} (99%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d85bd7e0..863c9470 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/app/app.cpp b/src/app/app.cpp index 023660b9..f6a35b98 100644 --- a/src/app/app.cpp +++ b/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" diff --git a/src/graphics/engine/camera.cpp b/src/graphics/engine/camera.cpp index 7f1e840f..02a15ccb 100644 --- a/src/graphics/engine/camera.cpp +++ b/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" diff --git a/src/graphics/engine/lightning.cpp b/src/graphics/engine/lightning.cpp index 80924dad..302135e4 100644 --- a/src/graphics/engine/lightning.cpp +++ b/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" diff --git a/src/graphics/engine/particle.cpp b/src/graphics/engine/particle.cpp index 96cd2971..e1f6dbe8 100644 --- a/src/graphics/engine/particle.cpp +++ b/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 diff --git a/src/graphics/engine/pyro.cpp b/src/graphics/engine/pyro.cpp index 350e618e..9b593a3e 100644 --- a/src/graphics/engine/pyro.cpp +++ b/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" diff --git a/src/object/auto/autobase.cpp b/src/object/auto/autobase.cpp index 5adbc281..20b42769 100644 --- a/src/object/auto/autobase.cpp +++ b/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" diff --git a/src/object/auto/autoconvert.cpp b/src/object/auto/autoconvert.cpp index d97db396..4eada144 100644 --- a/src/object/auto/autoconvert.cpp +++ b/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" diff --git a/src/object/auto/autoderrick.cpp b/src/object/auto/autoderrick.cpp index fc8978e7..525adb06 100644 --- a/src/object/auto/autoderrick.cpp +++ b/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" diff --git a/src/object/auto/autodestroyer.cpp b/src/object/auto/autodestroyer.cpp index ed8b3358..66a56a6a 100644 --- a/src/object/auto/autodestroyer.cpp +++ b/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" diff --git a/src/object/auto/autoegg.cpp b/src/object/auto/autoegg.cpp index 764b195f..2b505478 100644 --- a/src/object/auto/autoegg.cpp +++ b/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" diff --git a/src/object/auto/autoenergy.cpp b/src/object/auto/autoenergy.cpp index d09d4f14..10f5f250 100644 --- a/src/object/auto/autoenergy.cpp +++ b/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" diff --git a/src/object/auto/autofactory.cpp b/src/object/auto/autofactory.cpp index f1bdeeda..ec9d0c46 100644 --- a/src/object/auto/autofactory.cpp +++ b/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" diff --git a/src/object/auto/automush.cpp b/src/object/auto/automush.cpp index a2b60cdc..73ab8856 100644 --- a/src/object/auto/automush.cpp +++ b/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" diff --git a/src/object/auto/autonest.cpp b/src/object/auto/autonest.cpp index 77327d1a..328d1737 100644 --- a/src/object/auto/autonest.cpp +++ b/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" diff --git a/src/object/auto/autonuclear.cpp b/src/object/auto/autonuclear.cpp index e3bad7e1..dd181810 100644 --- a/src/object/auto/autonuclear.cpp +++ b/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" diff --git a/src/object/auto/autopara.cpp b/src/object/auto/autopara.cpp index 929ccd55..3158e230 100644 --- a/src/object/auto/autopara.cpp +++ b/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" diff --git a/src/object/auto/autoradar.cpp b/src/object/auto/autoradar.cpp index 0af668a3..86e066cb 100644 --- a/src/object/auto/autoradar.cpp +++ b/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" diff --git a/src/object/auto/autorepair.cpp b/src/object/auto/autorepair.cpp index e925f41f..1df801fd 100644 --- a/src/object/auto/autorepair.cpp +++ b/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" diff --git a/src/object/auto/autosafe.cpp b/src/object/auto/autosafe.cpp index e147ab24..5ece58e4 100644 --- a/src/object/auto/autosafe.cpp +++ b/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" diff --git a/src/object/auto/autostation.cpp b/src/object/auto/autostation.cpp index 18217f98..d43dd3b6 100644 --- a/src/object/auto/autostation.cpp +++ b/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" diff --git a/src/object/auto/autotower.cpp b/src/object/auto/autotower.cpp index 67b6facd..67270e5b 100644 --- a/src/object/auto/autotower.cpp +++ b/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" diff --git a/src/object/object.cpp b/src/object/object.cpp index f00e3d2b..58828f8f 100644 --- a/src/object/object.cpp +++ b/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" diff --git a/src/object/objman.cpp b/src/object/object_manager.cpp similarity index 99% rename from src/object/objman.cpp rename to src/object/object_manager.cpp index c38ba715..5c9561c6 100644 --- a/src/object/objman.cpp +++ b/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" diff --git a/src/object/objman.h b/src/object/object_manager.h similarity index 99% rename from src/object/objman.h rename to src/object/object_manager.h index ac5f4a28..303c5e2e 100644 --- a/src/object/objman.h +++ b/src/object/object_manager.h @@ -18,7 +18,7 @@ */ /** - * \file object/objman.h + * \file object/object_manager.h * \brief Object manager */ diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index ef322985..a227c051 100644 --- a/src/object/robotmain.cpp +++ b/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" diff --git a/src/object/task/taskbuild.cpp b/src/object/task/taskbuild.cpp index c74e2394..94fdd25c 100644 --- a/src/object/task/taskbuild.cpp +++ b/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" diff --git a/src/object/task/taskdeletemark.cpp b/src/object/task/taskdeletemark.cpp index 98f062b6..b99e0cbb 100644 --- a/src/object/task/taskdeletemark.cpp +++ b/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" diff --git a/src/object/task/taskflag.cpp b/src/object/task/taskflag.cpp index 617e72f7..f235db84 100644 --- a/src/object/task/taskflag.cpp +++ b/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" diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index 56bcf74e..340610f9 100644 --- a/src/object/task/taskgoto.cpp +++ b/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" diff --git a/src/object/task/taskinfo.cpp b/src/object/task/taskinfo.cpp index 470e8d01..762f7157 100644 --- a/src/object/task/taskinfo.cpp +++ b/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 diff --git a/src/object/task/taskmanip.cpp b/src/object/task/taskmanip.cpp index 1fac6d55..57cfcff1 100644 --- a/src/object/task/taskmanip.cpp +++ b/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" diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index f67948d0..c7d2f308 100644 --- a/src/object/task/taskrecover.cpp +++ b/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" diff --git a/src/object/task/taskreset.cpp b/src/object/task/taskreset.cpp index be1829e9..7ceffb23 100644 --- a/src/object/task/taskreset.cpp +++ b/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" diff --git a/src/object/task/tasksearch.cpp b/src/object/task/tasksearch.cpp index 9514bdab..12faf8b5 100644 --- a/src/object/task/tasksearch.cpp +++ b/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" diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp index 6961e39c..8ff7d1d8 100644 --- a/src/object/task/taskshield.cpp +++ b/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" diff --git a/src/object/task/tasktake.cpp b/src/object/task/tasktake.cpp index b3f67986..a77aa873 100644 --- a/src/object/task/tasktake.cpp +++ b/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" diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index f0832298..9d4c158c 100644 --- a/src/object/task/taskterraform.cpp +++ b/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" diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp index 26a87797..4eed2832 100644 --- a/src/physics/physics.cpp +++ b/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" diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp index 18bdc73a..70def565 100644 --- a/src/script/scriptfunc.cpp +++ b/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" diff --git a/src/ui/displayinfo.cpp b/src/ui/displayinfo.cpp index 687ae30a..a3e09387 100644 --- a/src/ui/displayinfo.cpp +++ b/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" diff --git a/src/ui/displaytext.cpp b/src/ui/displaytext.cpp index 931539f1..7e777381 100644 --- a/src/ui/displaytext.cpp +++ b/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" diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp index 7c6f50c7..c885abf0 100644 --- a/src/ui/mainshort.cpp +++ b/src/ui/mainshort.cpp @@ -22,7 +22,7 @@ #include "app/app.h" -#include "object/objman.h" +#include "object/object_manager.h" namespace Ui { diff --git a/src/ui/target.cpp b/src/ui/target.cpp index 6c2c5d74..b92d95c2 100644 --- a/src/ui/target.cpp +++ b/src/ui/target.cpp @@ -20,7 +20,7 @@ #include "ui/target.h" -#include "object/objman.h" +#include "object/object_manager.h" namespace Ui {