From bea2f9be2c08631fac4d6fe38a3a2caf122f5330 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 11 Dec 2022 03:19:11 +0100
Subject: [PATCH] [Reverse Eng] App: enable precompiled headers

- also some sorting
---
 .../App/AppReverseEngineering.cpp             | 26 +++++------
 .../ReverseEngineering/App/ApproxSurface.cpp  | 21 ++++-----
 .../ReverseEngineering/App/ApproxSurface.h    |  6 +--
 .../ReverseEngineering/App/BSplineFitting.cpp |  6 +--
 .../ReverseEngineering/App/BSplineFitting.h   |  9 ++--
 src/Mod/ReverseEngineering/App/CMakeLists.txt |  7 ++-
 .../ReverseEngineering/App/PreCompiled.cpp    |  1 -
 src/Mod/ReverseEngineering/App/PreCompiled.h  | 42 +++++++-----------
 .../ReverseEngineering/App/RegionGrowing.cpp  | 24 +++++-----
 .../ReverseEngineering/App/RegionGrowing.h    |  7 +--
 .../App/SampleConsensus.cpp                   | 25 ++++++-----
 .../ReverseEngineering/App/SampleConsensus.h  |  5 ++-
 .../ReverseEngineering/App/Segmentation.cpp   | 24 +++++-----
 src/Mod/ReverseEngineering/App/Segmentation.h |  7 +--
 .../App/SurfaceTriangulation.cpp              | 44 +++++++++----------
 .../App/SurfaceTriangulation.h                |  5 ++-
 16 files changed, 129 insertions(+), 130 deletions(-)

diff --git a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp
index b14636bba0..08c52a5e1c 100644
--- a/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp
+++ b/src/Mod/ReverseEngineering/App/AppReverseEngineering.cpp
@@ -22,35 +22,29 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
-# include <TColgp_Array1OfPnt.hxx>
 # include <Geom_BSplineSurface.hxx>
+# include <TColgp_Array1OfPnt.hxx>
 #endif
 
 #include <Base/Console.h>
-#include <Base/Converter.h>
-#include <Base/Interpreter.h>
-#include <Base/PyObjectBase.h>
 #include <Base/GeometryPyCXX.h>
-
-#include <CXX/Extensions.hxx>
-#include <CXX/Objects.hxx>
-
+#include <Base/Interpreter.h>
 #include <Mod/Part/App/BSplineSurfacePy.h>
-#include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/MeshPy.h>
 #include <Mod/Points/App/PointsPy.h>
+#if defined(HAVE_PCL_FILTERS)
+# include <pcl/filters/passthrough.h>
+# include <pcl/filters/voxel_grid.h>
+# include <pcl/point_types.h>
+#endif
 
 #include "ApproxSurface.h"
 #include "BSplineFitting.h"
-#include "SurfaceTriangulation.h"
 #include "RegionGrowing.h"
-#include "Segmentation.h"
 #include "SampleConsensus.h"
-#if defined(HAVE_PCL_FILTERS)
-#include <pcl/filters/passthrough.h>
-#include <pcl/filters/voxel_grid.h>
-#include <pcl/point_types.h>
-#endif
+#include "Segmentation.h"
+#include "SurfaceTriangulation.h"
+
 
 /*
 Dependency of pcl components:
diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp
index 0df5c39618..5e3188d97f 100644
--- a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp
+++ b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp
@@ -20,24 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
-#include <math_Gauss.hxx>
-#include <math_Householder.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <Precision.hxx>
+#ifndef _PreComp_
+# include <QFuture>
+# include <QFutureWatcher>
+# include <QtConcurrentMap>
 
-#include <QFuture>
-#include <QFutureWatcher>
-#include <QtConcurrentMap>
+# include <Geom_BSplineSurface.hxx>
+# include <math_Gauss.hxx>
+# include <math_Householder.hxx>
+# include <Precision.hxx>
+#endif
 
-#include <Mod/Mesh/App/Core/Approximation.h>
 #include <Base/Sequencer.h>
-#include <Base/Tools2D.h>
 #include <Base/Tools.h>
+#include <Mod/Mesh/App/Core/Approximation.h>
 
 #include "ApproxSurface.h"
 
+
 using namespace Reen;
 namespace bp = boost::placeholders;
 
diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.h b/src/Mod/ReverseEngineering/App/ApproxSurface.h
index 680b1dd210..f0ab0e3996 100644
--- a/src/Mod/ReverseEngineering/App/ApproxSurface.h
+++ b/src/Mod/ReverseEngineering/App/ApproxSurface.h
@@ -20,21 +20,21 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_APPROXSURFACE_H
 #define REEN_APPROXSURFACE_H
 
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array1OfInteger.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 #include <TColgp_Array2OfPnt.hxx>
 #include <TColgp_Array1OfPnt2d.hxx>
+#include <TColStd_Array1OfInteger.hxx>
+#include <TColStd_Array1OfReal.hxx>
 #include <Geom_BSplineSurface.hxx>
 #include <math_Matrix.hxx>
 
 #include <Base/Vector3D.h>
 #include <Mod/ReverseEngineering/ReverseEngineeringGlobal.h>
 
+
 namespace Base {
 class SequencerLauncher;
 }
diff --git a/src/Mod/ReverseEngineering/App/BSplineFitting.cpp b/src/Mod/ReverseEngineering/App/BSplineFitting.cpp
index 0d804e01d7..6df1ded66d 100644
--- a/src/Mod/ReverseEngineering/App/BSplineFitting.cpp
+++ b/src/Mod/ReverseEngineering/App/BSplineFitting.cpp
@@ -20,16 +20,16 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 #if defined(HAVE_PCL_OPENNURBS)
 #ifndef _PreComp_
+# include <map>
+
 # include <Geom_BSplineSurface.hxx>
 # include <TColgp_Array2OfPnt.hxx>
-# include <TColStd_Array2OfReal.hxx>
 # include <TColStd_Array1OfInteger.hxx>
 # include <TColStd_Array1OfReal.hxx>
-# include <map>
+# include <TColStd_Array2OfReal.hxx>
 #endif
 
 #include <Mod/Points/App/PointsPy.h>
diff --git a/src/Mod/ReverseEngineering/App/BSplineFitting.h b/src/Mod/ReverseEngineering/App/BSplineFitting.h
index cabcceca67..0dd1f2b740 100644
--- a/src/Mod/ReverseEngineering/App/BSplineFitting.h
+++ b/src/Mod/ReverseEngineering/App/BSplineFitting.h
@@ -20,14 +20,15 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_BSPLINEFITTING_H
 #define REEN_BSPLINEFITTING_H
 
 #if defined(HAVE_PCL_OPENNURBS)
-#include <Geom_BSplineSurface.hxx>
-#include <Base/Vector3D.h>
-#include <vector>
+# include <vector>
+
+# include <Base/Vector3D.h>
+# include <Geom_BSplineSurface.hxx>
+
 
 namespace Reen {
 
diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt
index 13d5d2ab5a..13e5360eae 100644
--- a/src/Mod/ReverseEngineering/App/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt
@@ -72,10 +72,15 @@ SET(Reen_SRCS
     PreCompiled.h
 )
 
+if(FREECAD_USE_PCH)
+    add_definitions(-D_PreComp_)
+    GET_MSVC_PRECOMPILED_SOURCE("PreCompiled.cpp" PCH_SRCS ${Reen_SRCS})
+    ADD_MSVC_PRECOMPILED_HEADER(ReverseEngineering PreCompiled.h PreCompiled.cpp PCH_SRCS)
+endif(FREECAD_USE_PCH)
+
 add_library(ReverseEngineering SHARED ${Reen_SRCS})
 target_link_libraries(ReverseEngineering ${Reen_LIBS})
 
-
 SET_BIN_DIR(ReverseEngineering ReverseEngineering /Mod/ReverseEngineering)
 SET_PYTHON_PREFIX_SUFFIX(ReverseEngineering)
 
diff --git a/src/Mod/ReverseEngineering/App/PreCompiled.cpp b/src/Mod/ReverseEngineering/App/PreCompiled.cpp
index 7cd1cae80f..cde4369c5b 100644
--- a/src/Mod/ReverseEngineering/App/PreCompiled.cpp
+++ b/src/Mod/ReverseEngineering/App/PreCompiled.cpp
@@ -20,5 +20,4 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
diff --git a/src/Mod/ReverseEngineering/App/PreCompiled.h b/src/Mod/ReverseEngineering/App/PreCompiled.h
index 69b62da8ce..f600eeed2b 100644
--- a/src/Mod/ReverseEngineering/App/PreCompiled.h
+++ b/src/Mod/ReverseEngineering/App/PreCompiled.h
@@ -20,51 +20,43 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef __PRECOMPILED__
 #define __PRECOMPILED__
 
 #include <FCConfig.h>
 
 #ifdef _MSC_VER
-#   pragma warning(disable : 4181)
-#   pragma warning(disable : 4267)
-#   pragma warning(disable : 4275)
-#   pragma warning(disable : 4305)
-#   pragma warning(disable : 4522)
+# pragma warning(disable : 4181)
+# pragma warning(disable : 4267)
+# pragma warning(disable : 4275)
+# pragma warning(disable : 4305)
+# pragma warning(disable : 4522)
 #endif
 
 // pcl headers include <boost/bind.hpp> instead of <boost/bind/bind.hpp>
 #ifndef BOOST_BIND_GLOBAL_PLACEHOLDERS
-#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+# define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #endif
 
 #ifdef _PreComp_
 
 // standard
-#include <iostream>
-#include <sstream>
-#include <cstdio>
-#include <cassert>
-#include <string>
 #include <map>
-#include <vector>
-#include <set>
-#include <bitset>
+
+// boost
+#include <boost/math/special_functions/fpclassify.hpp>
 
 // OpenCasCade
+#include <Geom_BSplineSurface.hxx>
 #include <math_Gauss.hxx>
 #include <math_Householder.hxx>
-#include <math_Matrix.hxx>
-#include <TColStd_Array1OfReal.hxx>
-#include <TColStd_Array1OfInteger.hxx>
+#include <Precision.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-#include <TColgp_Array2OfPnt.hxx>
-#include <TColgp_Array1OfPnt2d.hxx>
-#include <Geom_BSplineSurface.hxx>
-#include <BRepBuilderAPI_MakeFace.hxx>
-#include <TopoDS_Face.hxx>
 
-#endif
+// Qt
+#include <QFuture>
+#include <QFutureWatcher>
+#include <QtConcurrentMap>
+
 #endif // _PreComp_
-
+#endif
diff --git a/src/Mod/ReverseEngineering/App/RegionGrowing.cpp b/src/Mod/ReverseEngineering/App/RegionGrowing.cpp
index cd3f8fc297..3c5816a176 100644
--- a/src/Mod/ReverseEngineering/App/RegionGrowing.cpp
+++ b/src/Mod/ReverseEngineering/App/RegionGrowing.cpp
@@ -20,24 +20,26 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <boost/math/special_functions/fpclassify.hpp>
+#endif
+
+#include <Mod/Points/App/Points.h>
 
 #include "RegionGrowing.h"
-#include <Mod/Points/App/Points.h>
-#include <Base/Exception.h>
-#include <boost/math/special_functions/fpclassify.hpp>
+
 
 #if defined(HAVE_PCL_FILTERS)
-#include <pcl/filters/passthrough.h>
-#include <pcl/point_types.h>
+# include <pcl/filters/passthrough.h>
+# include <pcl/point_types.h>
 #endif
 #if defined(HAVE_PCL_SEGMENTATION)
-#include <pcl/search/search.h>
-#include <pcl/search/kdtree.h>
-#include <pcl/features/normal_3d.h>
-#include <pcl/segmentation/region_growing.h>
-#include <pcl/filters/extract_indices.h>
+# include <pcl/search/search.h>
+# include <pcl/search/kdtree.h>
+# include <pcl/features/normal_3d.h>
+# include <pcl/segmentation/region_growing.h>
+# include <pcl/filters/extract_indices.h>
 
 using namespace std;
 using namespace Reen;
diff --git a/src/Mod/ReverseEngineering/App/RegionGrowing.h b/src/Mod/ReverseEngineering/App/RegionGrowing.h
index c241f1de88..f38b92ece7 100644
--- a/src/Mod/ReverseEngineering/App/RegionGrowing.h
+++ b/src/Mod/ReverseEngineering/App/RegionGrowing.h
@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_REGIONGROWING_H
 #define REEN_REGIONGROWING_H
 
-#include <Base/Vector3D.h>
-#include <vector>
 #include <list>
+#include <vector>
+
+#include <Base/Vector3D.h>
+
 
 namespace Points {class PointKernel;}
 
diff --git a/src/Mod/ReverseEngineering/App/SampleConsensus.cpp b/src/Mod/ReverseEngineering/App/SampleConsensus.cpp
index 9c53911e5a..5dcf320ed1 100644
--- a/src/Mod/ReverseEngineering/App/SampleConsensus.cpp
+++ b/src/Mod/ReverseEngineering/App/SampleConsensus.cpp
@@ -20,22 +20,25 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
+#ifndef _PreComp_
+# include <boost/math/special_functions/fpclassify.hpp>
+#endif
+
+#include <Base/Exception.h>
+#include <Mod/Points/App/Points.h>
 
 #include "SampleConsensus.h"
-#include <Mod/Points/App/Points.h>
-#include <Base/Exception.h>
-#include <boost/math/special_functions/fpclassify.hpp>
+
 
 #if defined(HAVE_PCL_SAMPLE_CONSENSUS)
-#include <pcl/point_types.h>
-#include <pcl/features/normal_3d.h>
-#include <pcl/sample_consensus/ransac.h>
-#include <pcl/sample_consensus/sac_model_plane.h>
-#include <pcl/sample_consensus/sac_model_sphere.h>
-#include <pcl/sample_consensus/sac_model_cylinder.h>
-#include <pcl/sample_consensus/sac_model_cone.h>
+# include <pcl/point_types.h>
+# include <pcl/features/normal_3d.h>
+# include <pcl/sample_consensus/ransac.h>
+# include <pcl/sample_consensus/sac_model_cone.h>
+# include <pcl/sample_consensus/sac_model_cylinder.h>
+# include <pcl/sample_consensus/sac_model_plane.h>
+# include <pcl/sample_consensus/sac_model_sphere.h>
 
 using namespace std;
 using namespace Reen;
diff --git a/src/Mod/ReverseEngineering/App/SampleConsensus.h b/src/Mod/ReverseEngineering/App/SampleConsensus.h
index 0d8ea2cdf4..13d227e044 100644
--- a/src/Mod/ReverseEngineering/App/SampleConsensus.h
+++ b/src/Mod/ReverseEngineering/App/SampleConsensus.h
@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_SAMPLECONSENSUS_H
 #define REEN_SAMPLECONSENSUS_H
 
-#include <Base/Vector3D.h>
 #include <vector>
 
+#include <Base/Vector3D.h>
+
+
 namespace Points {class PointKernel;}
 
 namespace Reen {
diff --git a/src/Mod/ReverseEngineering/App/Segmentation.cpp b/src/Mod/ReverseEngineering/App/Segmentation.cpp
index b809c0e963..4f25a9344e 100644
--- a/src/Mod/ReverseEngineering/App/Segmentation.cpp
+++ b/src/Mod/ReverseEngineering/App/Segmentation.cpp
@@ -20,29 +20,29 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "Segmentation.h"
 #include <Mod/Points/App/Points.h>
-#include <Base/Exception.h>
+
+#include "Segmentation.h"
+
 
 #if defined(HAVE_PCL_FILTERS)
-#include <pcl/filters/extract_indices.h>
-#include <pcl/filters/passthrough.h>
-#include <pcl/features/normal_3d.h>
+# include <pcl/filters/extract_indices.h>
+# include <pcl/filters/passthrough.h>
+# include <pcl/features/normal_3d.h>
 #endif
 
 #if defined(HAVE_PCL_SAMPLE_CONSENSUS)
-#include <pcl/sample_consensus/method_types.h>
-#include <pcl/sample_consensus/model_types.h>
+# include <pcl/sample_consensus/method_types.h>
+# include <pcl/sample_consensus/model_types.h>
 #endif
 
 #if defined(HAVE_PCL_SEGMENTATION)
-#include <pcl/ModelCoefficients.h>
-#include <pcl/io/pcd_io.h>
-#include <pcl/point_types.h>
-#include <pcl/segmentation/sac_segmentation.h>
+# include <pcl/io/pcd_io.h>
+# include <pcl/ModelCoefficients.h>
+# include <pcl/point_types.h>
+# include <pcl/segmentation/sac_segmentation.h>
 #endif
 
 using namespace std;
diff --git a/src/Mod/ReverseEngineering/App/Segmentation.h b/src/Mod/ReverseEngineering/App/Segmentation.h
index 228b647b3f..94137e2357 100644
--- a/src/Mod/ReverseEngineering/App/Segmentation.h
+++ b/src/Mod/ReverseEngineering/App/Segmentation.h
@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_SEGMENTATION_H
 #define REEN_SEGMENTATION_H
 
-#include <Base/Vector3D.h>
-#include <vector>
 #include <list>
+#include <vector>
+
+#include <Base/Vector3D.h>
+
 
 namespace Points {class PointKernel;}
 
diff --git a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp
index f597cf4fd4..4baaa5c870 100644
--- a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp
+++ b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp
@@ -20,40 +20,39 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "PreCompiled.h"
 
-#include "SurfaceTriangulation.h"
+#include <Base/Exception.h>
 #include <Mod/Points/App/Points.h>
 #include <Mod/Mesh/App/Mesh.h>
 #include <Mod/Mesh/App/Core/Algorithm.h>
 #include <Mod/Mesh/App/Core/Elements.h>
 #include <Mod/Mesh/App/Core/MeshKernel.h>
-#include <Base/Exception.h>
+
+#include "SurfaceTriangulation.h"
+
 
 // http://svn.pointclouds.org/pcl/tags/pcl-1.5.1/test/
 #if defined(HAVE_PCL_SURFACE)
-#include <pcl/pcl_config.h>
-#include <pcl/point_types.h>
-#include <pcl/features/normal_3d.h>
-#include <pcl/surface/mls.h>
-#include <pcl/point_traits.h>
-#include <pcl/surface/gp3.h>
-#include <pcl/surface/grid_projection.h>
-#include <pcl/surface/poisson.h>
-//#include <pcl/surface/convex_hull.h>
-//#include <pcl/surface/concave_hull.h>
-#include <pcl/surface/organized_fast_mesh.h>
-#include <pcl/surface/marching_cubes_rbf.h>
-#include <pcl/surface/marching_cubes_hoppe.h>
-#include <pcl/surface/ear_clipping.h>
-#include <pcl/common/common.h>
-#include <pcl/common/io.h>
-#include <boost/random.hpp>
-#include <boost/math/special_functions/fpclassify.hpp>
+# include <boost/random.hpp>
+# include <boost/math/special_functions/fpclassify.hpp>
+# include <pcl/pcl_config.h>
+# include <pcl/point_types.h>
+# include <pcl/features/normal_3d.h>
+# include <pcl/surface/mls.h>
+# include <pcl/point_traits.h>
+# include <pcl/surface/gp3.h>
+# include <pcl/surface/grid_projection.h>
+# include <pcl/surface/poisson.h>
+# include <pcl/surface/organized_fast_mesh.h>
+# include <pcl/surface/marching_cubes_rbf.h>
+# include <pcl/surface/marching_cubes_hoppe.h>
+# include <pcl/surface/ear_clipping.h>
+# include <pcl/common/common.h>
+# include <pcl/common/io.h>
 
 #ifndef PCL_REVISION_VERSION
-#define PCL_REVISION_VERSION 0
+# define PCL_REVISION_VERSION 0
 #endif
 
 using namespace pcl;
@@ -765,4 +764,3 @@ void MeshConversion::convert(const pcl::PolygonMesh& pclMesh, Mesh::MeshObject&
 }
 
 #endif // HAVE_PCL_SURFACE
-
diff --git a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h
index 3299a8ff6f..3041d72ab5 100644
--- a/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h
+++ b/src/Mod/ReverseEngineering/App/SurfaceTriangulation.h
@@ -20,13 +20,14 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef REEN_SURFACETRIANGULATION_H
 #define REEN_SURFACETRIANGULATION_H
 
-#include <Base/Vector3D.h>
 #include <vector>
 
+#include <Base/Vector3D.h>
+
+
 namespace Points {class PointKernel;}
 namespace Mesh {class MeshObject;}
 namespace pcl {struct PolygonMesh;}