From 7bb7efc55facfb1389b20517bd21ec7599151522 Mon Sep 17 00:00:00 2001 From: Uwe Date: Tue, 1 Mar 2022 02:29:35 +0100 Subject: [PATCH] [Base] Parameter and Matrix: remove unused includes --- src/Base/Matrix.cpp | 3 +-- src/Base/Matrix.h | 5 +---- src/Base/MatrixPyImp.cpp | 5 +---- src/Base/MemDebug.cpp | 4 +--- src/Base/Observer.h | 8 ++------ src/Base/Parameter.cpp | 21 +++------------------ src/Base/Parameter.h | 4 ---- src/Base/ParameterPy.cpp | 15 +++------------ 8 files changed, 12 insertions(+), 53 deletions(-) diff --git a/src/Base/Matrix.cpp b/src/Base/Matrix.cpp index 297502a5de..06eba0c295 100644 --- a/src/Base/Matrix.cpp +++ b/src/Base/Matrix.cpp @@ -23,15 +23,14 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include #endif - #include "Matrix.h" #include "Converter.h" + using namespace Base; Matrix4D::Matrix4D () diff --git a/src/Base/Matrix.h b/src/Base/Matrix.h index e56c0f752b..afcb95d0ed 100644 --- a/src/Base/Matrix.h +++ b/src/Base/Matrix.h @@ -24,10 +24,6 @@ #ifndef BASE_MATRIX_H #define BASE_MATRIX_H -#include -#include -#include -#include #include #include "Vector3D.h" @@ -35,6 +31,7 @@ #include #endif + namespace Base { enum class ScaleType { diff --git a/src/Base/MatrixPyImp.cpp b/src/Base/MatrixPyImp.cpp index ecdc5eea71..676d4c0f7a 100644 --- a/src/Base/MatrixPyImp.cpp +++ b/src/Base/MatrixPyImp.cpp @@ -23,10 +23,6 @@ #include "PreCompiled.h" -#include -#include -#include "Base/Matrix.h" - // inclusion of the generated files (generated out of MatrixPy.xml) #include "RotationPy.h" #include "VectorPy.h" @@ -35,6 +31,7 @@ #include "MatrixPy.h" #include "MatrixPy.cpp" + using namespace Base; // returns a string which represents the object e.g. when printed in python diff --git a/src/Base/MemDebug.cpp b/src/Base/MemDebug.cpp index fbcfbc63cd..99a1e6ce19 100644 --- a/src/Base/MemDebug.cpp +++ b/src/Base/MemDebug.cpp @@ -41,18 +41,16 @@ #ifndef _PreComp_ # ifdef _MSC_VER -# include # include -# include # include # endif #endif - /// Here the FreeCAD includes sorted by Base,App,Gui...... #include "MemDebug.h" #include + using namespace Base; #if defined(_MSC_VER) diff --git a/src/Base/Observer.h b/src/Base/Observer.h index 2951d00367..a03aa6a67c 100644 --- a/src/Base/Observer.h +++ b/src/Base/Observer.h @@ -25,15 +25,11 @@ #ifndef BASE_OBSERVER_H #define BASE_OBSERVER_H -// Std. configurations - #include #include -#include -#include -#include -#include "Exception.h" #include "Console.h" +#include "Exception.h" + namespace Base { diff --git a/src/Base/Parameter.cpp b/src/Base/Parameter.cpp index aecddb3bd6..87f885d3f8 100644 --- a/src/Base/Parameter.cpp +++ b/src/Base/Parameter.cpp @@ -27,45 +27,30 @@ #ifndef _PreComp_ # include # include -# include -# include # include -# include -# include # if (XERCES_VERSION_MAJOR == 2) # include # endif -# include # include # include # include # include # include -# include -# include -# include # include # include -# include -# include -# include -# ifdef FC_OS_WIN32 -# include -# endif # include -# include +# include +# include #endif - -#include #ifdef FC_OS_LINUX # include #endif #include "Parameter.h" #include "Parameter.inl" -#include "Exception.h" #include "Console.h" +#include "Exception.h" //#ifdef XERCES_HAS_CPP_NAMESPACE diff --git a/src/Base/Parameter.h b/src/Base/Parameter.h index 5f16e81c9e..bf591c70a6 100644 --- a/src/Base/Parameter.h +++ b/src/Base/Parameter.h @@ -32,9 +32,6 @@ #ifndef BASE__PARAMETER_H #define BASE__PARAMETER_H -// Include files -#include - #ifdef FC_OS_MACOSX #undef toupper #undef tolower @@ -53,7 +50,6 @@ #include #include -// Std. configurations #include "Handle.h" #include "Observer.h" diff --git a/src/Base/ParameterPy.cpp b/src/Base/ParameterPy.cpp index 2d131d2a5e..e69b11d103 100644 --- a/src/Base/ParameterPy.cpp +++ b/src/Base/ParameterPy.cpp @@ -25,31 +25,22 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include -# include -# include # ifdef FC_OS_WIN32 -# include # include # endif -# include -# include # include +# include +# include +# include #endif - -#include #ifdef FC_OS_LINUX # include #endif #include "Parameter.h" #include "Exception.h" -#include "Console.h" -#include "PyObjectBase.h" #include "Interpreter.h" -#include namespace Base {