Forward declaration: removed task.h dependency from task_executor_obj…

…ect.h
colobot · Mar 2, 2025 · c4e904c · c4e904c
1 parent 8eff3a5
commit c4e904c
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 3 deletions.
diff --git a/colobot-base/src/common/error.h b/colobot-base/src/common/error.h
@@ -28,7 +28,7 @@
  * \enum Error
  * \brief Type of error or info message
  */
-enum Error
+enum Error : unsigned int
 {
     ERR_OK                = 0,        //!<  ok
     ERR_UNKNOWN           = 1,        //!<  any error

diff --git a/colobot-base/src/object/auto/autojostle.cpp b/colobot-base/src/object/auto/autojostle.cpp
@@ -24,6 +24,7 @@
 
 #include "graphics/engine/engine.h"
 
+#include "math/const.h"
 
 // Object's constructor.
 

diff --git a/colobot-base/src/object/auto/autoportico.cpp b/colobot-base/src/object/auto/autoportico.cpp
@@ -24,6 +24,8 @@
 
 #include "common/stringutils.h"
 
+#include "math/const.h"
+
 #include "level/robotmain.h"
 
 #include "object/old_object.h"

diff --git a/colobot-base/src/object/implementation/task_executor_impl.h b/colobot-base/src/object/implementation/task_executor_impl.h
@@ -24,6 +24,7 @@
 #include <memory>
 
 class CObject;
+struct Event;
 
 class CTaskExecutorObjectImpl : public CTaskExecutorObject
 {

diff --git a/colobot-base/src/object/interface/task_executor_object.h b/colobot-base/src/object/interface/task_executor_object.h
@@ -22,8 +22,6 @@
 #include "object/object.h"
 #include "object/object_interface_type.h"
 
-#include "object/task/task.h"
-
 enum TaskFlagOrder : unsigned char;
 enum TaskManipOrder : unsigned char;
 enum TaskManipArm : unsigned char;
@@ -34,6 +32,10 @@ enum TaskGotoCrash : signed char;
 
 enum class TraceColor : signed char;
 
+enum Error : unsigned int;
+
+class CBackgroundTask;
+class CForegroundTask;
 
 /**
  * \class CTaskExecutorObject

diff --git a/colobot-base/src/object/motion/motionlevelcontroller.cpp b/colobot-base/src/object/motion/motionlevelcontroller.cpp
@@ -22,6 +22,8 @@
 
 #include "graphics/engine/engine.h"
 
+#include "math/const.h"
+
 #include "object/old_object.h"
 
 #include "physics/physics.h"

diff --git a/colobot-base/src/object/motion/motionvehicle.cpp b/colobot-base/src/object/motion/motionvehicle.cpp
@@ -38,6 +38,8 @@
 #include "object/interface/slotted_object.h"
 #include "object/interface/transportable_object.h"
 
+#include "object/task/task.h"
+
 #include "physics/physics.h"
 
 #include <stdio.h>

diff --git a/colobot-base/src/object/old_object.cpp b/colobot-base/src/object/old_object.cpp
@@ -54,6 +54,8 @@
 #include "object/motion/motion.h"
 #include "object/motion/motionvehicle.h"
 
+#include "object/task/task.h"
+
 #include "object/subclass/base_alien.h"
 #include "object/subclass/exchange_post.h"
 

diff --git a/colobot-base/src/object/old_object.h b/colobot-base/src/object/old_object.h
@@ -69,6 +69,8 @@ struct ObjectPart
     glm::mat4    matWorld;
 };
 
+class CSoundInterface;
+
 namespace Ui
 {
 class CObjectInterface;
@@ -77,6 +79,9 @@ class CObjectInterface;
 namespace Gfx
 {
 enum class EngineShadowType : unsigned char;
+
+class CParticle;
+class CLightManager;
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,6 +24,7 @@

		#include "graphics/engine/engine.h"

		#include "math/const.h"

		// Object's constructor.

Expand Down