From cc4b8b4cd10a27ff3d2ffefa94988f4810274c26 Mon Sep 17 00:00:00 2001 From: Uwe Date: Wed, 7 Dec 2022 17:52:49 +0100 Subject: [PATCH] [Points] improve PreCompiled.h handling --- src/Mod/Points/App/Points.cpp | 3 +- src/Mod/Points/App/PointsAlgos.cpp | 11 ++++---- src/Mod/Points/App/PointsGrid.cpp | 4 --- src/Mod/Points/App/PointsPyImp.cpp | 5 ++-- src/Mod/Points/App/PreCompiled.h | 23 ++++++--------- src/Mod/Points/Gui/DlgPointsReadImp.h | 3 +- src/Mod/Points/Gui/PreCompiled.h | 40 ++++++++++++--------------- src/Mod/Points/Gui/ViewProvider.cpp | 5 ++-- src/Mod/Points/Gui/ViewProvider.h | 3 +- 9 files changed, 40 insertions(+), 57 deletions(-) diff --git a/src/Mod/Points/App/Points.cpp b/src/Mod/Points/App/Points.cpp index d306585104..d95381f666 100644 --- a/src/Mod/Points/App/Points.cpp +++ b/src/Mod/Points/App/Points.cpp @@ -25,10 +25,9 @@ # include # include # include +# include #endif -#include - #include #include #include diff --git a/src/Mod/Points/App/PointsAlgos.cpp b/src/Mod/Points/App/PointsAlgos.cpp index 9676d36a86..13889cc27a 100644 --- a/src/Mod/Points/App/PointsAlgos.cpp +++ b/src/Mod/Points/App/PointsAlgos.cpp @@ -27,12 +27,11 @@ # endif # include # include -#endif -#include -#include -#include -#include +# include +# include +# include +#endif #include #include @@ -40,9 +39,9 @@ #include #include #include -#include #include "PointsAlgos.h" +#include using namespace Points; diff --git a/src/Mod/Points/App/PointsGrid.cpp b/src/Mod/Points/App/PointsGrid.cpp index 31ba18e7eb..b15605b9fb 100644 --- a/src/Mod/Points/App/PointsGrid.cpp +++ b/src/Mod/Points/App/PointsGrid.cpp @@ -22,10 +22,6 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif - #include "PointsGrid.h" diff --git a/src/Mod/Points/App/PointsPyImp.cpp b/src/Mod/Points/App/PointsPyImp.cpp index 1b4dc40317..18bba559be 100644 --- a/src/Mod/Points/App/PointsPyImp.cpp +++ b/src/Mod/Points/App/PointsPyImp.cpp @@ -21,8 +21,9 @@ ***************************************************************************/ #include "PreCompiled.h" - -#include +#ifndef _PreComp_ +# include +#endif #include #include diff --git a/src/Mod/Points/App/PreCompiled.h b/src/Mod/Points/App/PreCompiled.h index 53f93ee329..423f04153f 100644 --- 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 - // standard # include -# include // STL # include -# include -# include # include -# include # include -# include -# include -# include # include -# include # include # include -# include -# include # include +// boost +# include +# include +# include +# include + +// Qt +# include + #endif //_PreComp_ #endif diff --git a/src/Mod/Points/Gui/DlgPointsReadImp.h b/src/Mod/Points/Gui/DlgPointsReadImp.h index d36e261104..3f8dfc53f5 100644 --- 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 #include #include + namespace PointsGui { class Ui_DlgPointsRead; diff --git a/src/Mod/Points/Gui/PreCompiled.h b/src/Mod/Points/Gui/PreCompiled.h index 82a9bac52e..8bfecfb20c 100644 --- 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 -# include - // STL # include -# include -# include # include -# include -# include -# include -# include -# include -# include -# include -# include +# include #ifdef FC_OS_WIN32 # include #endif +// boost +# include -// Qt Toolkit -#ifndef __QtAll__ -# include -#endif +// Qt +# include +# include // Inventor -#ifndef __InventorAll__ -# include -#endif - +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include #endif //_PreComp_ diff --git a/src/Mod/Points/Gui/ViewProvider.cpp b/src/Mod/Points/Gui/ViewProvider.cpp index fe9410a4ce..8167da2e91 100644 --- a/src/Mod/Points/Gui/ViewProvider.cpp +++ b/src/Mod/Points/Gui/ViewProvider.cpp @@ -21,9 +21,10 @@ ***************************************************************************/ #include "PreCompiled.h" - #ifndef _PreComp_ # include +# include + # include # include # include @@ -36,8 +37,6 @@ # include #endif -#include - #include #include #include diff --git a/src/Mod/Points/Gui/ViewProvider.h b/src/Mod/Points/Gui/ViewProvider.h index 1c550e1737..fc782d5639 100644 --- 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 + #include #include #include -#include #include