From 409ae97fc13c0b2bdb69adf6f6d8872bcf8ad516 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sun, 29 May 2022 11:05:55 +0200
Subject: [PATCH] Part: move ChFi2d wrappers to own sub-directory

---
 src/Mod/Part/App/AppPart.cpp                  |  4 ++--
 src/Mod/Part/App/CMakeLists.txt               | 20 +++++++++++++------
 .../App/{ => ChFi2d}/ChFi2d_FilletAPIPy.xml   |  0
 .../{ => ChFi2d}/ChFi2d_FilletAPIPyImp.cpp    |  4 ++--
 .../App/{ => ChFi2d}/ChFi2d_FilletAlgoPy.xml  |  0
 .../{ => ChFi2d}/ChFi2d_FilletAlgoPyImp.cpp   |  4 ++--
 6 files changed, 20 insertions(+), 12 deletions(-)
 rename src/Mod/Part/App/{ => ChFi2d}/ChFi2d_FilletAPIPy.xml (100%)
 rename src/Mod/Part/App/{ => ChFi2d}/ChFi2d_FilletAPIPyImp.cpp (98%)
 rename src/Mod/Part/App/{ => ChFi2d}/ChFi2d_FilletAlgoPy.xml (100%)
 rename src/Mod/Part/App/{ => ChFi2d}/ChFi2d_FilletAlgoPyImp.cpp (98%)

diff --git a/src/Mod/Part/App/AppPart.cpp b/src/Mod/Part/App/AppPart.cpp
index e170deee77..b4a207b888 100644
--- a/src/Mod/Part/App/AppPart.cpp
+++ b/src/Mod/Part/App/AppPart.cpp
@@ -51,8 +51,8 @@
 #include "Mod/Part/App/BRepOffsetAPI_MakePipeShellPy.h"
 #include "Mod/Part/App/BSplineCurvePy.h"
 #include "Mod/Part/App/BSplineSurfacePy.h"
-#include <Mod/Part/App/ChFi2d_FilletAlgoPy.h>
-#include <Mod/Part/App/ChFi2d_FilletAPIPy.h>
+#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPy.h>
+#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPy.h>
 #include "Mod/Part/App/CirclePy.h"
 #include "Mod/Part/App/ConePy.h"
 #include "Mod/Part/App/ConicPy.h"
diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt
index 8ca6c32388..b25b5d67f2 100644
--- a/src/Mod/Part/App/CMakeLists.txt
+++ b/src/Mod/Part/App/CMakeLists.txt
@@ -91,12 +91,11 @@ generate_from_xml(TopoShapeVertexPy)
 generate_from_xml(TopoShapeWirePy)
 generate_from_xml(BRepOffsetAPI_MakePipeShellPy)
 generate_from_xml(BRepOffsetAPI_MakeFillingPy)
-generate_from_xml(ChFi2d_FilletAlgoPy)
-generate_from_xml(ChFi2d_FilletAPIPy)
 generate_from_xml(PrecisionPy)
 
 # make sure to create the directory at configure time
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/BRepFeat)
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ChFi2d)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Geom2d)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/GeomPlate)
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/HLRBRep)
@@ -104,6 +103,9 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ShapeUpgrade)
 
 generate_from_xml(BRepFeat/MakePrismPy)
 
+generate_from_xml(ChFi2d/ChFi2d_FilletAlgoPy)
+generate_from_xml(ChFi2d/ChFi2d_FilletAPIPy)
+
 generate_from_xml(Geom2d/ArcOfCircle2dPy)
 generate_from_xml(Geom2d/ArcOfConic2dPy)
 generate_from_xml(Geom2d/ArcOfEllipse2dPy)
@@ -320,10 +322,6 @@ SET(Python_SRCS
     BRepOffsetAPI_MakePipeShellPyImp.cpp
     BRepOffsetAPI_MakeFillingPy.xml
     BRepOffsetAPI_MakeFillingPyImp.cpp
-    ChFi2d_FilletAlgoPy.xml
-    ChFi2d_FilletAlgoPyImp.cpp
-    ChFi2d_FilletAPIPy.xml
-    ChFi2d_FilletAPIPyImp.cpp
     PrecisionPy.xml
     PrecisionPyImp.cpp
     PartPyCXX.cpp
@@ -338,6 +336,15 @@ SET(BRepFeatPy_SRCS
 )
 SOURCE_GROUP("BRepFeat" FILES ${BRepFeatPy_SRCS})
 
+# ChFi2d wrappers
+SET(ChFi2dPy_SRCS
+    ChFi2d/ChFi2d_FilletAlgoPy.xml
+    ChFi2d/ChFi2d_FilletAlgoPyImp.cpp
+    ChFi2d/ChFi2d_FilletAPIPy.xml
+    ChFi2d/ChFi2d_FilletAPIPyImp.cpp
+)
+SOURCE_GROUP("ChFi2d" FILES ${ChFi2dPy_SRCS})
+
 # Geom2d wrappers
 SET(Geom2dPy_SRCS
     Geom2d/ArcOfCircle2dPy.xml
@@ -417,6 +424,7 @@ SET(Part_SRCS
     ${Properties_SRCS}
     ${Python_SRCS}
     ${BRepFeatPy_SRCS}
+    ${ChFi2dPy_SRCS}
     ${Geom2dPy_SRCS}
     ${GeomPlatePy_SRCS}
     ${HLRBRepPy_SRCS}
diff --git a/src/Mod/Part/App/ChFi2d_FilletAPIPy.xml b/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPy.xml
similarity index 100%
rename from src/Mod/Part/App/ChFi2d_FilletAPIPy.xml
rename to src/Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPy.xml
diff --git a/src/Mod/Part/App/ChFi2d_FilletAPIPyImp.cpp b/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPyImp.cpp
similarity index 98%
rename from src/Mod/Part/App/ChFi2d_FilletAPIPyImp.cpp
rename to src/Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPyImp.cpp
index 7ae3bca4e9..5c51798b43 100644
--- a/src/Mod/Part/App/ChFi2d_FilletAPIPyImp.cpp
+++ b/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPyImp.cpp
@@ -30,8 +30,8 @@
 # include <TopoDS_Wire.hxx>
 #endif
 
-#include <Mod/Part/App/ChFi2d_FilletAPIPy.h>
-#include <Mod/Part/App/ChFi2d_FilletAPIPy.cpp>
+#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPy.h>
+#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAPIPy.cpp>
 #include <Mod/Part/App/TopoShapeEdgePy.h>
 #include <Mod/Part/App/TopoShapeWirePy.h>
 #include <Mod/Part/App/Geometry.h>
diff --git a/src/Mod/Part/App/ChFi2d_FilletAlgoPy.xml b/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPy.xml
similarity index 100%
rename from src/Mod/Part/App/ChFi2d_FilletAlgoPy.xml
rename to src/Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPy.xml
diff --git a/src/Mod/Part/App/ChFi2d_FilletAlgoPyImp.cpp b/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPyImp.cpp
similarity index 98%
rename from src/Mod/Part/App/ChFi2d_FilletAlgoPyImp.cpp
rename to src/Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPyImp.cpp
index 7403578f4b..def26c0611 100644
--- a/src/Mod/Part/App/ChFi2d_FilletAlgoPyImp.cpp
+++ b/src/Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPyImp.cpp
@@ -30,8 +30,8 @@
 # include <TopoDS_Wire.hxx>
 #endif
 
-#include <Mod/Part/App/ChFi2d_FilletAlgoPy.h>
-#include <Mod/Part/App/ChFi2d_FilletAlgoPy.cpp>
+#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPy.h>
+#include <Mod/Part/App/ChFi2d/ChFi2d_FilletAlgoPy.cpp>
 #include <Mod/Part/App/TopoShapeEdgePy.h>
 #include <Mod/Part/App/TopoShapeWirePy.h>
 #include <Mod/Part/App/Geometry.h>