refactor(objects): moved services into objects/service

core/src/common.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "objects/base/instance.h"
 #include "handles.h"
-#include "objects/workspace.h"
+#include "objects/service/workspace.h"
 #include "objects/datamodel.h"
 #include "camera.h"
 #include <functional>

core/src/objects/datamodel.cpp

@@ -1,12 +1,12 @@
 #include "datamodel.h"
-#include "base/service.h"
+#include "objects/base/service.h"
 #include "objects/base/instance.h"
 #include "objects/base/refstate.h"
 #include "objects/base/service.h"
 #include "objects/meta.h"
-#include "objects/script/serverscriptservice.h"
+#include "objects/service/script/serverscriptservice.h"
 #include "datatypes/variant.h"
-#include "workspace.h"
+#include "objects/service/workspace.h"
 #include "logger.h"
 #include "panic.h"
 #include <pugixml.hpp>

core/src/objects/joint/jointinstance.cpp

@@ -3,9 +3,9 @@
 #include "datatypes/cframe.h"
 #include "datatypes/ref.h"
 #include "objects/datamodel.h"
-#include "objects/jointsservice.h"
+#include "objects/service/jointsservice.h"
 #include "objects/part.h"
-#include "objects/workspace.h"
+#include "objects/service/workspace.h"
 #include <memory>
 #include <reactphysics3d/constraint/FixedJoint.h>
 #include <reactphysics3d/engine/PhysicsWorld.h>

core/src/objects/joint/rotate.cpp

@@ -1,7 +1,7 @@
 #include "rotate.h"
-#include "objects/jointsservice.h"
+#include "objects/service/jointsservice.h"
 #include "objects/part.h"
-#include "objects/workspace.h"
+#include "objects/service/workspace.h"
 #include "rendering/renderer.h"
 #include <reactphysics3d/constraint/HingeJoint.h>
 

core/src/objects/joint/rotatev.cpp

@@ -1,7 +1,7 @@
 #include "rotatev.h"
-#include "objects/jointsservice.h"
+#include "objects/service/jointsservice.h"
 #include "objects/part.h"
-#include "objects/workspace.h"
+#include "objects/service/workspace.h"
 #include "rendering/renderer.h"
 #include <reactphysics3d/constraint/HingeJoint.h>
 

core/src/objects/joint/snap.cpp

@@ -3,9 +3,9 @@
 #include "datatypes/cframe.h"
 #include "objects/datamodel.h"
 #include "objects/joint/jointinstance.h"
-#include "objects/jointsservice.h"
+#include "objects/service/jointsservice.h"
 #include "objects/part.h"
-#include "objects/workspace.h"
+#include "objects/service/workspace.h"
 #include <memory>
 #include <reactphysics3d/constraint/FixedJoint.h>
 #include <reactphysics3d/engine/PhysicsWorld.h>

core/src/objects/joint/weld.cpp

@@ -3,9 +3,9 @@
 #include "datatypes/cframe.h"
 #include "objects/datamodel.h"
 #include "objects/joint/jointinstance.h"
-#include "objects/jointsservice.h"
+#include "objects/service/jointsservice.h"
 #include "objects/part.h"
-#include "objects/workspace.h"
+#include "objects/service/workspace.h"
 #include <memory>
 #include <reactphysics3d/constraint/FixedJoint.h>
 #include <reactphysics3d/engine/PhysicsWorld.h>

core/src/objects/meta.cpp

@@ -4,14 +4,14 @@
 #include "objects/joint/rotate.h"
 #include "objects/joint/rotatev.h"
 #include "objects/joint/weld.h"
-#include "objects/jointsservice.h"
+#include "objects/service/jointsservice.h"
 #include "objects/model.h"
 #include "objects/part.h"
 #include "objects/joint/snap.h"
 #include "objects/script.h"
-#include "objects/script/scriptcontext.h"
-#include "objects/script/serverscriptservice.h"
-#include "objects/workspace.h"
+#include "objects/service/script/scriptcontext.h"
+#include "objects/service/script/serverscriptservice.h"
+#include "objects/service/workspace.h"
 #include "objects/datamodel.h"
 
 std::map<std::string, const InstanceType*> INSTANCE_MAP = {

core/src/objects/part.cpp

@@ -9,7 +9,7 @@
 #include "objects/joint/rotate.h"
 #include "objects/joint/rotatev.h"
 #include "objects/joint/weld.h"
-#include "objects/jointsservice.h"
+#include "objects/service/jointsservice.h"
 #include "objects/joint/jointinstance.h"
 #include "objects/joint/snap.h"
 #include "rendering/renderer.h"

core/src/objects/script.cpp

@@ -3,8 +3,8 @@
 #include "logger.h"
 #include "objects/base/instance.h"
 #include "objects/base/member.h"
-#include "objects/script/scriptcontext.h"
-#include "objects/workspace.h"
+#include "objects/service/script/scriptcontext.h"
+#include "objects/service/workspace.h"
 #include "objects/datamodel.h"
 #include "datatypes/ref.h"
 #include "lua.h" // IWYU pragma: keep

core/src/objects/service/jointsservice.cpp

@@ -1,6 +1,6 @@
 #include "jointsservice.h"
-#include "workspace.h"
-#include "datamodel.h"
+#include "objects/service/workspace.h"
+#include "objects/datamodel.h"
 #include <memory>
 
 JointsService::JointsService(): Service(&TYPE) {

core/src/objects/service/script/serverscriptservice.cpp

@@ -1,6 +1,6 @@
 #include "serverscriptservice.h"
 #include "objects/script.h"
-#include "objects/workspace.h"
+#include "objects/service/workspace.h"
 #include "objects/datamodel.h"
 
 ServerScriptService::ServerScriptService(): Service(&TYPE) {

core/src/objects/service/workspace.cpp

@@ -3,7 +3,7 @@
 #include "datatypes/ref.h"
 #include "datatypes/vector.h"
 #include "objects/base/instance.h"
-#include "objects/jointsservice.h"
+#include "objects/service/jointsservice.h"
 #include "objects/joint/jointinstance.h"
 #include "objects/datamodel.h"
 #include "physics/util.h"

editor/placedocument.cpp

@@ -4,7 +4,7 @@
 #include "mainwindow.h"
 #include "objects/joint/snap.h"
 #include "objects/script.h"
-#include "objects/script/scriptcontext.h"
+#include "objects/service/script/scriptcontext.h"
 #include "enum/surface.h"
 #include <cstdio>
 #include <memory>