From c7910825a3c81546c3e7d2ef2598394aaa9eed92 Mon Sep 17 00:00:00 2001 From: Uwe Date: Wed, 23 Feb 2022 03:54:45 +0100 Subject: [PATCH] [App] Placement and Property: remove unused includes --- src/App/Placement.cpp | 3 --- src/App/Placement.h | 19 ----------------- src/App/Property.cpp | 10 ++++----- src/App/Property.h | 6 ++---- src/App/PropertyContainer.cpp | 14 +++---------- src/App/PropertyContainer.h | 1 - src/App/PropertyContainerPyImp.cpp | 2 -- src/App/PropertyExpressionEngine.cpp | 14 +++++-------- src/App/PropertyExpressionEngine.h | 1 - src/App/PropertyFile.cpp | 15 +++----------- src/App/PropertyFile.h | 6 ------ src/App/PropertyGeo.cpp | 31 +++++++++++----------------- src/App/PropertyGeo.h | 9 ++++---- src/App/PropertyLinks.cpp | 24 +++++++-------------- src/App/PropertyLinks.h | 9 ++------ src/App/PropertyPythonObject.cpp | 20 ++++++++---------- src/App/PropertyPythonObject.h | 2 -- src/App/PropertyStandard.cpp | 16 ++++---------- src/App/PropertyStandard.h | 10 ++++----- src/App/PropertyUnits.cpp | 15 +++----------- src/App/PropertyUnits.h | 11 ++-------- src/App/Range.cpp | 11 ++++++---- 22 files changed, 71 insertions(+), 178 deletions(-) diff --git a/src/App/Placement.cpp b/src/App/Placement.cpp index d3e9364337..dadba176ad 100644 --- a/src/App/Placement.cpp +++ b/src/App/Placement.cpp @@ -23,9 +23,6 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include #include "Placement.h" diff --git a/src/App/Placement.h b/src/App/Placement.h index e7ae37dcea..a34475d574 100644 --- a/src/App/Placement.h +++ b/src/App/Placement.h @@ -25,25 +25,11 @@ #define _AppPlacement_h_ #include - #include "FeaturePython.h" -#include "GeoFeature.h" -#include "PropertyGeo.h" - - -namespace Base -{ -// class Vector3D; - //class Matrix4D; -} - -//using Base::Vector3D; -//using Base::Matrix4D; namespace App { - /** Placement Object * Handles the repositioning of data. Also can do grouping */ @@ -52,8 +38,6 @@ class AppExport Placement: public App::GeoFeature PROPERTY_HEADER(App::Placement); public: - - /// Constructor Placement(void); virtual ~Placement(); @@ -68,10 +52,7 @@ public: typedef App::FeaturePythonT PlacementPython; - - } //namespace App - #endif diff --git a/src/App/Property.cpp b/src/App/Property.cpp index 52876db92c..7dc5caa5d0 100644 --- a/src/App/Property.cpp +++ b/src/App/Property.cpp @@ -24,19 +24,17 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +#include #endif #include +#include +#include -/// Here the FreeCAD includes sorted by Base,App,Gui...... #include "Property.h" #include "ObjectIdentifier.h" #include "PropertyContainer.h" -#include -#include -#include "Application.h" -#include "DocumentObject.h" + using namespace App; diff --git a/src/App/Property.h b/src/App/Property.h index 8258724db3..d6f3cc4614 100644 --- a/src/App/Property.h +++ b/src/App/Property.h @@ -24,14 +24,12 @@ #ifndef APP_PROPERTY_H #define APP_PROPERTY_H -// Std. configurations - #include #include #include -#include -#include #include +#include +#include #include namespace Py { diff --git a/src/App/PropertyContainer.cpp b/src/App/PropertyContainer.cpp index 9abad5e779..a5f8d63f47 100644 --- a/src/App/PropertyContainer.cpp +++ b/src/App/PropertyContainer.cpp @@ -23,22 +23,14 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -# include -# include -#endif - -/// Here the FreeCAD includes sorted by Base,App,Gui...... -#include -#include #include #include +#include +#include -#include "Application.h" #include "Property.h" #include "PropertyContainer.h" -#include "PropertyLinks.h" + FC_LOG_LEVEL_INIT("App",true,true) diff --git a/src/App/PropertyContainer.h b/src/App/PropertyContainer.h index 92458b8d5a..f7ebe291c2 100644 --- a/src/App/PropertyContainer.h +++ b/src/App/PropertyContainer.h @@ -25,7 +25,6 @@ #define APP_PROPERTYCONTAINER_H #include -#include #include #include diff --git a/src/App/PropertyContainerPyImp.cpp b/src/App/PropertyContainerPyImp.cpp index 7eec6216f5..af5380ef29 100644 --- a/src/App/PropertyContainerPyImp.cpp +++ b/src/App/PropertyContainerPyImp.cpp @@ -29,8 +29,6 @@ #include "PropertyContainer.h" #include "Property.h" -#include "PropertyLinks.h" -#include "Application.h" #include "DocumentObject.h" #include diff --git a/src/App/PropertyExpressionEngine.cpp b/src/App/PropertyExpressionEngine.cpp index e316c0310d..858073d5b9 100644 --- a/src/App/PropertyExpressionEngine.cpp +++ b/src/App/PropertyExpressionEngine.cpp @@ -21,21 +21,17 @@ ***************************************************************************/ #include "PreCompiled.h" + #include #include #include -#include -#include #include #include -#include "ExpressionParser.h" -#include "ExpressionVisitors.h" +#include + #include "PropertyExpressionEngine.h" -#include "PropertyStandard.h" -#include "PropertyUnits.h" -#include -#include -#include +#include "ExpressionVisitors.h" + FC_LOG_LEVEL_INIT("App",true); diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h index edc2748ab1..caa0fe18d4 100644 --- a/src/App/PropertyExpressionEngine.h +++ b/src/App/PropertyExpressionEngine.h @@ -28,7 +28,6 @@ #include #include #include -#include #include #include diff --git a/src/App/PropertyFile.cpp b/src/App/PropertyFile.cpp index c563cb79c6..563ca2a8a6 100644 --- a/src/App/PropertyFile.cpp +++ b/src/App/PropertyFile.cpp @@ -23,25 +23,16 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -# include -#endif - -/// Here the FreeCAD includes sorted by Base,App,Gui...... - -#include +#include #include #include -#include -#include -#include #include #include "PropertyFile.h" #include "Document.h" -#include "PropertyContainer.h" #include "DocumentObject.h" +#include "PropertyContainer.h" + using namespace App; using namespace Base; diff --git a/src/App/PropertyFile.h b/src/App/PropertyFile.h index 72dea92d47..f512ae4522 100644 --- a/src/App/PropertyFile.h +++ b/src/App/PropertyFile.h @@ -24,13 +24,7 @@ #ifndef APP_PROPERTFILE_H #define APP_PROPERTFILE_H -// Std. configurations - - #include -#include -#include -#include #include "PropertyStandard.h" diff --git a/src/App/PropertyGeo.cpp b/src/App/PropertyGeo.cpp index 062e78a7b9..dc109e744d 100644 --- a/src/App/PropertyGeo.cpp +++ b/src/App/PropertyGeo.cpp @@ -23,31 +23,24 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif - -/// Here the FreeCAD includes sorted by Base,App,Gui...... - -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include -#include "Document.h" -#include "DocumentObject.h" -#include "Placement.h" #include "PropertyGeo.h" +#include "Placement.h" #include "ObjectIdentifier.h" + using namespace App; using namespace Base; using namespace std; diff --git a/src/App/PropertyGeo.h b/src/App/PropertyGeo.h index 77825f52c1..633e4b567c 100644 --- a/src/App/PropertyGeo.h +++ b/src/App/PropertyGeo.h @@ -24,19 +24,18 @@ #ifndef APP_PROPERTYGEO_H #define APP_PROPERTYGEO_H -// Std. configurations - -#include -#include #include +#include #include #include +#include #include "Property.h" -#include "PropertyLinks.h" #include "ComplexGeoData.h" +#include "PropertyLinks.h" #include + namespace Base { class Writer; } diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index 3144bb3b3d..83728b086d 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -23,32 +23,22 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -# include -#endif - -#include -#include #include - +#include #include #include -/// Here the FreeCAD includes sorted by Base,App,Gui...... -#include +#include #include #include #include -#include -#include - -#include "Application.h" -#include "DocumentObject.h" -#include "DocumentObjectPy.h" -#include "Document.h" #include "PropertyLinks.h" +#include "Application.h" +#include "Document.h" +#include "DocumentObject.h" +#include "DocumentObjectPy.h" + FC_LOG_LEVEL_INIT("PropertyLinks",true,true) diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h index 5f527ba765..da9f9838ff 100644 --- a/src/App/PropertyLinks.h +++ b/src/App/PropertyLinks.h @@ -24,15 +24,10 @@ #ifndef APP_PROPERTYLINKS_H #define APP_PROPERTYLINKS_H -// Std. configurations -#include - -#include -#include #include +#include #include -#include -#include +#include #include "Property.h" namespace Base { diff --git a/src/App/PropertyPythonObject.cpp b/src/App/PropertyPythonObject.cpp index 8e201a5cba..b8433162f5 100644 --- a/src/App/PropertyPythonObject.cpp +++ b/src/App/PropertyPythonObject.cpp @@ -23,20 +23,18 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - -#include "PropertyPythonObject.h" -#include "DocumentObjectPy.h" -#include "DocumentObject.h" -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include + +#include "PropertyPythonObject.h" +#include "DocumentObject.h" + + using namespace App; diff --git a/src/App/PropertyPythonObject.h b/src/App/PropertyPythonObject.h index bd4bec9339..dfaea0f7bd 100644 --- a/src/App/PropertyPythonObject.h +++ b/src/App/PropertyPythonObject.h @@ -25,8 +25,6 @@ #define APP_PROPERTYPYTHONOBJECT_H #include -#include -#include #include #include "Property.h" diff --git a/src/App/PropertyStandard.cpp b/src/App/PropertyStandard.cpp index 3344c9a29a..2847560f5f 100644 --- a/src/App/PropertyStandard.cpp +++ b/src/App/PropertyStandard.cpp @@ -23,31 +23,23 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -# include -# include -#endif - -/// Here the FreeCAD includes sorted by Base,App,Gui...... -#include #include +#include #include #include #include #include -#include #include #include #include "PropertyStandard.h" -#include "PropertyLinks.h" -#include "MaterialPy.h" -#include "ObjectIdentifier.h" #include "Application.h" #include "Document.h" #include "DocumentObject.h" +#include "MaterialPy.h" +#include "ObjectIdentifier.h" + using namespace App; using namespace Base; diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h index 7bc229bfdd..e9c477aa91 100644 --- a/src/App/PropertyStandard.h +++ b/src/App/PropertyStandard.h @@ -24,21 +24,19 @@ #ifndef APP_PROPERTYSTANDARD_H #define APP_PROPERTYSTANDARD_H -// Std. configurations - - +#include #include #include -#include #include #include #include - #include -#include "Enumeration.h" + #include "Property.h" +#include "Enumeration.h" #include "Material.h" + namespace Base { class Writer; } diff --git a/src/App/PropertyUnits.cpp b/src/App/PropertyUnits.cpp index 6189e144fb..61d21f036f 100644 --- a/src/App/PropertyUnits.cpp +++ b/src/App/PropertyUnits.cpp @@ -24,25 +24,16 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include # include #endif -/// Here the FreeCAD includes sorted by Base,App,Gui...... - -#include -#include -#include -#include -#include - -#include "PropertyUnits.h" -#include #include #include + +#include "PropertyUnits.h" #include "Expression.h" + using namespace App; using namespace Base; using namespace std; diff --git a/src/App/PropertyUnits.h b/src/App/PropertyUnits.h index 2b24e59095..1f6155e75f 100644 --- a/src/App/PropertyUnits.h +++ b/src/App/PropertyUnits.h @@ -24,16 +24,9 @@ #ifndef APP_PROPERTYUNITS_H #define APP_PROPERTYUNITS_H -// Std. configurations - - -#include -#include -#include -#include - -#include #include +#include + #include "PropertyStandard.h" namespace Base { diff --git a/src/App/Range.cpp b/src/App/Range.cpp index 00c8fb8a27..d77dab7b86 100644 --- a/src/App/Range.cpp +++ b/src/App/Range.cpp @@ -21,12 +21,15 @@ ***************************************************************************/ #include "PreCompiled.h" -#include "Range.h" + #include -#include -#include -#include #include +#include +#include +#include + +#include "Range.h" + using namespace App;