From 9c42209e93304989c4885c5811de7e354fa62229 Mon Sep 17 00:00:00 2001 From: maelstrom Date: Mon, 23 Jun 2025 02:37:09 +0200 Subject: [PATCH] refactor(objects): moved services into objects/service --- core/src/common.h | 2 +- core/src/objects/datamodel.cpp | 6 +++--- core/src/objects/joint/jointinstance.cpp | 4 ++-- core/src/objects/joint/rotate.cpp | 4 ++-- core/src/objects/joint/rotatev.cpp | 4 ++-- core/src/objects/joint/snap.cpp | 4 ++-- core/src/objects/joint/weld.cpp | 4 ++-- core/src/objects/meta.cpp | 8 ++++---- core/src/objects/part.cpp | 2 +- core/src/objects/script.cpp | 4 ++-- core/src/objects/{ => service}/jointsservice.cpp | 4 ++-- core/src/objects/{ => service}/jointsservice.h | 0 core/src/objects/{ => service}/script/scriptcontext.cpp | 0 core/src/objects/{ => service}/script/scriptcontext.h | 0 .../objects/{ => service}/script/serverscriptservice.cpp | 2 +- .../objects/{ => service}/script/serverscriptservice.h | 0 core/src/objects/{ => service}/workspace.cpp | 2 +- core/src/objects/{ => service}/workspace.h | 0 editor/placedocument.cpp | 2 +- 19 files changed, 26 insertions(+), 26 deletions(-) rename core/src/objects/{ => service}/jointsservice.cpp (88%) rename core/src/objects/{ => service}/jointsservice.h (100%) rename core/src/objects/{ => service}/script/scriptcontext.cpp (100%) rename core/src/objects/{ => service}/script/scriptcontext.h (100%) rename core/src/objects/{ => service}/script/serverscriptservice.cpp (95%) rename core/src/objects/{ => service}/script/serverscriptservice.h (100%) rename core/src/objects/{ => service}/workspace.cpp (99%) rename core/src/objects/{ => service}/workspace.h (100%) diff --git a/core/src/common.h b/core/src/common.h index d50d4e1..86d1f49 100644 --- a/core/src/common.h +++ b/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 diff --git a/core/src/objects/datamodel.cpp b/core/src/objects/datamodel.cpp index 4c63ef9..3ebba1a 100644 --- a/core/src/objects/datamodel.cpp +++ b/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 diff --git a/core/src/objects/joint/jointinstance.cpp b/core/src/objects/joint/jointinstance.cpp index 4980dad..69e90ad 100644 --- a/core/src/objects/joint/jointinstance.cpp +++ b/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 #include #include diff --git a/core/src/objects/joint/rotate.cpp b/core/src/objects/joint/rotate.cpp index c0c5c89..97a8057 100644 --- a/core/src/objects/joint/rotate.cpp +++ b/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 diff --git a/core/src/objects/joint/rotatev.cpp b/core/src/objects/joint/rotatev.cpp index 20776e4..92fc1b7 100644 --- a/core/src/objects/joint/rotatev.cpp +++ b/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 diff --git a/core/src/objects/joint/snap.cpp b/core/src/objects/joint/snap.cpp index 04685da..a4e1406 100644 --- a/core/src/objects/joint/snap.cpp +++ b/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 #include #include diff --git a/core/src/objects/joint/weld.cpp b/core/src/objects/joint/weld.cpp index f63c485..0215c83 100644 --- a/core/src/objects/joint/weld.cpp +++ b/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 #include #include diff --git a/core/src/objects/meta.cpp b/core/src/objects/meta.cpp index 613ead5..16b3d3c 100644 --- a/core/src/objects/meta.cpp +++ b/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 INSTANCE_MAP = { diff --git a/core/src/objects/part.cpp b/core/src/objects/part.cpp index 61f3227..eb88c57 100644 --- a/core/src/objects/part.cpp +++ b/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" diff --git a/core/src/objects/script.cpp b/core/src/objects/script.cpp index b678902..217bbdc 100644 --- a/core/src/objects/script.cpp +++ b/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 diff --git a/core/src/objects/jointsservice.cpp b/core/src/objects/service/jointsservice.cpp similarity index 88% rename from core/src/objects/jointsservice.cpp rename to core/src/objects/service/jointsservice.cpp index 8126a0a..4c535e4 100644 --- a/core/src/objects/jointsservice.cpp +++ b/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 JointsService::JointsService(): Service(&TYPE) { diff --git a/core/src/objects/jointsservice.h b/core/src/objects/service/jointsservice.h similarity index 100% rename from core/src/objects/jointsservice.h rename to core/src/objects/service/jointsservice.h diff --git a/core/src/objects/script/scriptcontext.cpp b/core/src/objects/service/script/scriptcontext.cpp similarity index 100% rename from core/src/objects/script/scriptcontext.cpp rename to core/src/objects/service/script/scriptcontext.cpp diff --git a/core/src/objects/script/scriptcontext.h b/core/src/objects/service/script/scriptcontext.h similarity index 100% rename from core/src/objects/script/scriptcontext.h rename to core/src/objects/service/script/scriptcontext.h diff --git a/core/src/objects/script/serverscriptservice.cpp b/core/src/objects/service/script/serverscriptservice.cpp similarity index 95% rename from core/src/objects/script/serverscriptservice.cpp rename to core/src/objects/service/script/serverscriptservice.cpp index e24c98b..29e1b40 100644 --- a/core/src/objects/script/serverscriptservice.cpp +++ b/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) { diff --git a/core/src/objects/script/serverscriptservice.h b/core/src/objects/service/script/serverscriptservice.h similarity index 100% rename from core/src/objects/script/serverscriptservice.h rename to core/src/objects/service/script/serverscriptservice.h diff --git a/core/src/objects/workspace.cpp b/core/src/objects/service/workspace.cpp similarity index 99% rename from core/src/objects/workspace.cpp rename to core/src/objects/service/workspace.cpp index 8a85ec9..629f99c 100644 --- a/core/src/objects/workspace.cpp +++ b/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" diff --git a/core/src/objects/workspace.h b/core/src/objects/service/workspace.h similarity index 100% rename from core/src/objects/workspace.h rename to core/src/objects/service/workspace.h diff --git a/editor/placedocument.cpp b/editor/placedocument.cpp index f20b4f0..fc7b53e 100644 --- a/editor/placedocument.cpp +++ b/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 #include