From f345b85b2da98ffd02b6e42dcc1600a05703acc6 Mon Sep 17 00:00:00 2001 From: Uwe Date: Tue, 6 Dec 2022 01:25:49 +0100 Subject: [PATCH] [Raytracing] App: remove unused includes - also some sorting --- src/Mod/Raytracing/App/AppRaytracing.cpp | 6 +-- src/Mod/Raytracing/App/AppRaytracingPy.cpp | 10 ++--- src/Mod/Raytracing/App/LuxFeature.cpp | 6 +-- src/Mod/Raytracing/App/LuxFeature.h | 3 -- src/Mod/Raytracing/App/LuxProject.cpp | 8 ++-- src/Mod/Raytracing/App/LuxProject.h | 5 +-- src/Mod/Raytracing/App/LuxTools.cpp | 16 +++---- src/Mod/Raytracing/App/LuxTools.h | 3 +- src/Mod/Raytracing/App/PovTools.cpp | 14 +++--- src/Mod/Raytracing/App/PovTools.h | 3 +- src/Mod/Raytracing/App/PreCompiled.h | 51 ++-------------------- src/Mod/Raytracing/App/RayFeature.cpp | 4 -- src/Mod/Raytracing/App/RayFeature.h | 3 -- src/Mod/Raytracing/App/RayProject.cpp | 10 ++--- src/Mod/Raytracing/App/RayProject.h | 5 +-- src/Mod/Raytracing/App/RaySegment.cpp | 12 +---- src/Mod/Raytracing/App/RaySegment.h | 6 --- 17 files changed, 35 insertions(+), 130 deletions(-) diff --git a/src/Mod/Raytracing/App/AppRaytracing.cpp b/src/Mod/Raytracing/App/AppRaytracing.cpp index 53a6f3dd8e..ba66b72a26 100644 --- a/src/Mod/Raytracing/App/AppRaytracing.cpp +++ b/src/Mod/Raytracing/App/AppRaytracing.cpp @@ -23,14 +23,14 @@ #include "PreCompiled.h" #include -#include #include +#include +#include "LuxFeature.h" +#include "LuxProject.h" #include "RayFeature.h" #include "RayProject.h" #include "RaySegment.h" -#include "LuxFeature.h" -#include "LuxProject.h" namespace Raytracing { diff --git a/src/Mod/Raytracing/App/AppRaytracingPy.cpp b/src/Mod/Raytracing/App/AppRaytracingPy.cpp index 20fa6df33e..0e08725f14 100644 --- a/src/Mod/Raytracing/App/AppRaytracingPy.cpp +++ b/src/Mod/Raytracing/App/AppRaytracingPy.cpp @@ -22,22 +22,18 @@ #include "PreCompiled.h" -#include -#include +#include #include #include #include #include -#include "PovTools.h" +#include + #include "LuxTools.h" // automatically generated..... #include "FreeCADpov.h" -#include -#include -#include - using namespace std; diff --git a/src/Mod/Raytracing/App/LuxFeature.cpp b/src/Mod/Raytracing/App/LuxFeature.cpp index ac9c587b94..e2c0defe7e 100644 --- a/src/Mod/Raytracing/App/LuxFeature.cpp +++ b/src/Mod/Raytracing/App/LuxFeature.cpp @@ -20,22 +20,18 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ +# include # include #endif -#include -#include #include #include "LuxFeature.h" #include "LuxTools.h" -#include - using namespace Raytracing; using namespace std; diff --git a/src/Mod/Raytracing/App/LuxFeature.h b/src/Mod/Raytracing/App/LuxFeature.h index e69248844a..9b73535eb2 100644 --- a/src/Mod/Raytracing/App/LuxFeature.h +++ b/src/Mod/Raytracing/App/LuxFeature.h @@ -20,14 +20,11 @@ * * ***************************************************************************/ - #ifndef _LuxFeature_h_ #define _LuxFeature_h_ #include #include -#include -#include #include "RaySegment.h" diff --git a/src/Mod/Raytracing/App/LuxProject.cpp b/src/Mod/Raytracing/App/LuxProject.cpp index 19dcce0cd7..aec6c9cd95 100644 --- a/src/Mod/Raytracing/App/LuxProject.cpp +++ b/src/Mod/Raytracing/App/LuxProject.cpp @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ @@ -28,12 +27,13 @@ # include #endif -#include -#include #include +#include +#include + #include "LuxProject.h" #include "LuxFeature.h" -#include "LuxTools.h" + using namespace Raytracing; using namespace std; diff --git a/src/Mod/Raytracing/App/LuxProject.h b/src/Mod/Raytracing/App/LuxProject.h index cf850972c2..44e494561b 100644 --- a/src/Mod/Raytracing/App/LuxProject.h +++ b/src/Mod/Raytracing/App/LuxProject.h @@ -20,17 +20,14 @@ * * ***************************************************************************/ - - - #ifndef _LuxProject_h_ #define _LuxProject_h_ #include -#include #include #include + namespace Raytracing { diff --git a/src/Mod/Raytracing/App/LuxTools.cpp b/src/Mod/Raytracing/App/LuxTools.cpp index 86db2ee16f..7e280965b9 100644 --- a/src/Mod/Raytracing/App/LuxTools.cpp +++ b/src/Mod/Raytracing/App/LuxTools.cpp @@ -23,28 +23,22 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +# include + # include -# include -# include -# include # include # include # include -# include + #endif #include -#include #include -#include -#include -#include - +#include #include "PovTools.h" #include "LuxTools.h" -#include + using Base::Console; diff --git a/src/Mod/Raytracing/App/LuxTools.h b/src/Mod/Raytracing/App/LuxTools.h index ae7f501a91..ea6a480b9f 100644 --- a/src/Mod/Raytracing/App/LuxTools.h +++ b/src/Mod/Raytracing/App/LuxTools.h @@ -20,15 +20,14 @@ * * ***************************************************************************/ - #ifndef _LuxTools_h_ #define _LuxTools_h_ -#include #include #include "PovTools.h" + class TopoDS_Shape; class TopoDS_Face; diff --git a/src/Mod/Raytracing/App/PovTools.cpp b/src/Mod/Raytracing/App/PovTools.cpp index 4dbba9fe5d..3aa6c0a74d 100644 --- a/src/Mod/Raytracing/App/PovTools.cpp +++ b/src/Mod/Raytracing/App/PovTools.cpp @@ -23,26 +23,22 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +# include + # include -# include -# include -# include # include # include # include -# include #endif +#include #include -#include #include #include -#include - +#include #include "PovTools.h" -#include + using Base::Console; diff --git a/src/Mod/Raytracing/App/PovTools.h b/src/Mod/Raytracing/App/PovTools.h index afcbc50958..ef290abac3 100644 --- a/src/Mod/Raytracing/App/PovTools.h +++ b/src/Mod/Raytracing/App/PovTools.h @@ -20,14 +20,15 @@ * * ***************************************************************************/ - #ifndef _PovTools_h_ #define _PovTools_h_ #include #include + #include + class TopoDS_Shape; class TopoDS_Face; diff --git a/src/Mod/Raytracing/App/PreCompiled.h b/src/Mod/Raytracing/App/PreCompiled.h index e335cc7b4e..c190b6bd80 100644 --- a/src/Mod/Raytracing/App/PreCompiled.h +++ b/src/Mod/Raytracing/App/PreCompiled.h @@ -20,7 +20,6 @@ * * ***************************************************************************/ - #ifndef __PRECOMPILED__ #define __PRECOMPILED__ @@ -32,9 +31,9 @@ #include #include - // STL #include +#include #include #include #include @@ -44,60 +43,16 @@ #include #include #include -#include // OpenCascade View -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include #include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #endif //_PreComp_ diff --git a/src/Mod/Raytracing/App/RayFeature.cpp b/src/Mod/Raytracing/App/RayFeature.cpp index 4303216f53..511555cda2 100644 --- a/src/Mod/Raytracing/App/RayFeature.cpp +++ b/src/Mod/Raytracing/App/RayFeature.cpp @@ -20,15 +20,11 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include #endif -#include -#include #include #include "RayFeature.h" diff --git a/src/Mod/Raytracing/App/RayFeature.h b/src/Mod/Raytracing/App/RayFeature.h index 8d1d757835..1ad4068b8c 100644 --- a/src/Mod/Raytracing/App/RayFeature.h +++ b/src/Mod/Raytracing/App/RayFeature.h @@ -20,14 +20,11 @@ * * ***************************************************************************/ - #ifndef _RayFeature_h_ #define _RayFeature_h_ #include #include -#include -#include #include "RaySegment.h" diff --git a/src/Mod/Raytracing/App/RayProject.cpp b/src/Mod/Raytracing/App/RayProject.cpp index 852888649b..5f562d1929 100644 --- a/src/Mod/Raytracing/App/RayProject.cpp +++ b/src/Mod/Raytracing/App/RayProject.cpp @@ -20,21 +20,21 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include # include #endif -#include -#include -#include #include +#include +#include +#include + #include "RayProject.h" #include "RayFeature.h" + using namespace Raytracing; using namespace std; diff --git a/src/Mod/Raytracing/App/RayProject.h b/src/Mod/Raytracing/App/RayProject.h index f1f58432e0..de9a654caf 100644 --- a/src/Mod/Raytracing/App/RayProject.h +++ b/src/Mod/Raytracing/App/RayProject.h @@ -20,17 +20,14 @@ * * ***************************************************************************/ - - - #ifndef _RayProject_h_ #define _RayProject_h_ #include -#include #include #include + namespace Raytracing { diff --git a/src/Mod/Raytracing/App/RaySegment.cpp b/src/Mod/Raytracing/App/RaySegment.cpp index 4cf89dfac2..4f9d18bd6a 100644 --- a/src/Mod/Raytracing/App/RaySegment.cpp +++ b/src/Mod/Raytracing/App/RaySegment.cpp @@ -20,23 +20,15 @@ * * ***************************************************************************/ - #include "PreCompiled.h" - #ifndef _PreComp_ # include #endif - -#include -#include -#include -#include - #include "RaySegment.h" -using namespace Raytracing; +using namespace Raytracing; //=========================================================================== // RaySegment @@ -44,8 +36,6 @@ using namespace Raytracing; PROPERTY_SOURCE(Raytracing::RaySegment, App::DocumentObject) - - RaySegment::RaySegment(void) { App::PropertyType type = static_cast((App::Prop_Output|App::Prop_Hidden)); diff --git a/src/Mod/Raytracing/App/RaySegment.h b/src/Mod/Raytracing/App/RaySegment.h index eac0df6c0f..af983868b5 100644 --- a/src/Mod/Raytracing/App/RaySegment.h +++ b/src/Mod/Raytracing/App/RaySegment.h @@ -20,23 +20,17 @@ * * ***************************************************************************/ - - - #ifndef _RaySegment_h_ #define _RaySegment_h_ - #include #include -#include #include namespace Raytracing { - /** Base class of all View Features in the drawing module */ class RaytracingExport RaySegment: public App::DocumentObject