[Points] improve PreCompiled.h handling

FreeCAD · Dec 7, 2022 · 987314b · wwmayer · Dec 7, 2022 · donovaly
1 parent 059b441
commit 987314b
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 57 deletions.
diff --git a/src/Mod/Points/App/Points.cpp b/src/Mod/Points/App/Points.cpp
@@ -25,10 +25,9 @@
 # include <cmath>
 # include <iostream>
 # include <QtConcurrentMap>
+# include <boost/math/special_functions/fpclassify.hpp>
 #endif
 
-#include <boost/math/special_functions/fpclassify.hpp>
-
 #include <Base/Matrix.h>
 #include <Base/Stream.h>
 #include <Base/Writer.h>

diff --git a/src/Mod/Points/App/PointsAlgos.cpp b/src/Mod/Points/App/PointsAlgos.cpp
@@ -27,22 +27,21 @@
 # endif
 # include <memory>
 # include <sstream>
-#endif
 
-#include <boost/lexical_cast.hpp>
-#include <boost/regex.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/math/special_functions/fpclassify.hpp>
+# include <boost/lexical_cast.hpp>
+# include <boost/regex.hpp>
+# include <boost/algorithm/string.hpp>
+#endif
 
 #include <Base/Console.h>
 #include <Base/Converter.h>
 #include <Base/Exception.h>
 #include <Base/FileInfo.h>
 #include <Base/Sequencer.h>
 #include <Base/Stream.h>
-#include <E57Format.h>
 
 #include "PointsAlgos.h"
+#include <E57Format.h>
 
 
 using namespace Points;

diff --git a/src/Mod/Points/App/PointsGrid.cpp b/src/Mod/Points/App/PointsGrid.cpp
@@ -22,10 +22,6 @@
 
 #include "PreCompiled.h"
 
-#ifndef _PreComp_
-# include <algorithm>
-#endif
-
 #include "PointsGrid.h"
 
 

diff --git a/src/Mod/Points/App/PointsPyImp.cpp b/src/Mod/Points/App/PointsPyImp.cpp
@@ -21,8 +21,9 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
-#include <boost/math/special_functions/fpclassify.hpp>
+#ifndef _PreComp_
+# include <boost/math/special_functions/fpclassify.hpp>
+#endif
 
 #include <Base/Builder3D.h>
 #include <Base/Converter.h>

diff --git a/src/Mod/Points/App/PreCompiled.h b/src/Mod/Points/App/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef POINTS_PRECOMPILED_H
 #define POINTS_PRECOMPILED_H
 
@@ -35,31 +34,27 @@
 
 #ifdef _PreComp_
 
-// Qt
-# include <QtConcurrentMap>
-
 // standard
 # include <cstdio>
-# include <cassert>
 
 // STL
 # include <algorithm>
-# include <bitset>
-# include <cfloat>
 # include <cmath>
-# include <cstdlib>
 # include <iostream>
-# include <fstream>
-# include <list>
-# include <map>
 # include <memory>
-# include <queue>
 # include <set>
 # include <sstream>
-# include <stack>
-# include <string>
 # include <vector>
 
+// boost
+# include <boost/lexical_cast.hpp>
+# include <boost/math/special_functions/fpclassify.hpp>
+# include <boost/regex.hpp>
+# include <boost/algorithm/string.hpp>
+
+// Qt
+# include <QtConcurrentMap>
+
 #endif //_PreComp_
 
 #endif

diff --git a/src/Mod/Points/Gui/DlgPointsReadImp.h b/src/Mod/Points/Gui/DlgPointsReadImp.h
@@ -20,14 +20,13 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef POINTSGUI_DLGREADPOINTS_H
 #define POINTSGUI_DLGREADPOINTS_H
 
-#include <string>
 #include <memory>
 #include <QDialog>
 
+
 namespace PointsGui {
 class Ui_DlgPointsRead;
 

diff --git a/src/Mod/Points/Gui/PreCompiled.h b/src/Mod/Points/Gui/PreCompiled.h
@@ -20,7 +20,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #ifndef POINTSGUI_PRECOMPILED_H
 #define POINTSGUI_PRECOMPILED_H
 
@@ -34,39 +33,34 @@
 
 #ifdef _PreComp_
 
-// standard
-# include <cstdio>
-# include <cassert>
-
 // STL
 # include <algorithm>
-# include <bitset>
-# include <iostream>
 # include <limits>
-# include <list>
-# include <map>
-# include <queue>
-# include <set>
-# include <sstream>
-# include <stack>
-# include <string>
-# include <vector>
+# include <memory>
 
 #ifdef FC_OS_WIN32
 # include <windows.h>
 #endif
 
+// boost
+# include <boost/math/special_functions/fpclassify.hpp>
 
-// Qt Toolkit
-#ifndef __QtAll__
-# include <Gui/QtAll.h>
-#endif
+// Qt
+# include <QDialog>
+# include <QInputDialog>
 
 // Inventor
-#ifndef __InventorAll__
-# include <Gui/InventorAll.h>
-#endif
-
+# include <Inventor/SbVec2f.h>
+# include <Inventor/errors/SoDebugError.h>
+# include <Inventor/events/SoMouseButtonEvent.h>
+# include <Inventor/nodes/SoCamera.h>
+# include <Inventor/nodes/SoCoordinate3.h>
+# include <Inventor/nodes/SoDrawStyle.h>
+# include <Inventor/nodes/SoIndexedPointSet.h>
+# include <Inventor/nodes/SoMaterial.h>
+# include <Inventor/nodes/SoMaterialBinding.h>
+# include <Inventor/nodes/SoNormal.h>
+# include <Inventor/nodes/SoPointSet.h>
 
 #endif  //_PreComp_
 

diff --git a/src/Mod/Points/Gui/ViewProvider.cpp b/src/Mod/Points/Gui/ViewProvider.cpp
@@ -21,9 +21,10 @@
  ***************************************************************************/
 
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # include <limits>
+# include <boost/math/special_functions/fpclassify.hpp>
+
 # include <Inventor/errors/SoDebugError.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
 # include <Inventor/nodes/SoCamera.h>
@@ -36,8 +37,6 @@
 # include <Inventor/nodes/SoPointSet.h>
 #endif
 
-#include <boost/math/special_functions/fpclassify.hpp>
-
 #include <App/Document.h>
 #include <Base/Vector3D.h>
 #include <Gui/Application.h>

diff --git a/src/Mod/Points/Gui/ViewProvider.h b/src/Mod/Points/Gui/ViewProvider.h
@@ -23,10 +23,11 @@
 #ifndef POINTSGUI_VIEWPROVIDERPOINTS_H
 #define POINTSGUI_VIEWPROVIDERPOINTS_H
 
+#include <Inventor/SbVec2f.h>
+
 #include <Gui/ViewProviderBuilder.h>
 #include <Gui/ViewProviderGeometryObject.h>
 #include <Gui/ViewProviderPythonFeature.h>
-#include <Inventor/SbVec2f.h>
 #include <Mod/Points/PointsGlobal.h>