From 09ce5ce137d69958c0393ae9d485f91d4164dfd9 Mon Sep 17 00:00:00 2001 From: Uwe Date: Tue, 22 Feb 2022 03:15:08 +0100 Subject: [PATCH] [App] Document: remove unused includes --- src/App/Document.cpp | 49 ++++++++---------------- src/App/Document.h | 11 ++---- src/App/DocumentObject.cpp | 19 ++++----- src/App/DocumentObject.h | 10 ++--- src/App/DocumentObjectExtension.cpp | 5 --- src/App/DocumentObjectExtension.h | 1 - src/App/DocumentObjectExtensionPyImp.cpp | 4 -- src/App/DocumentObjectFileIncluded.cpp | 4 -- src/App/DocumentObjectFileIncluded.h | 1 - src/App/DocumentObjectGroup.cpp | 4 -- src/App/DocumentObjectGroup.h | 4 +- src/App/DocumentObjectGroupPyImp.cpp | 2 - src/App/DocumentObjectPyImp.cpp | 4 +- src/App/DocumentObserver.cpp | 11 ++---- src/App/DocumentObserver.h | 3 +- src/App/DocumentObserverPython.cpp | 7 +--- src/App/DocumentObserverPython.h | 6 --- src/App/DocumentPyImp.cpp | 6 +-- 18 files changed, 41 insertions(+), 110 deletions(-) diff --git a/src/App/Document.cpp b/src/App/Document.cpp index 2440a03452..2008b13e8b 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -51,28 +51,18 @@ The FreeCAD document handles the dependencies of its DocumentObjects with an adjacence list. This gives the opportunity to calculate the shortest recompute path. Also, it enables more complicated dependencies beyond trees. - @see App::Application @see App::DocumentObject */ - - #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include -# include # include -# include # include #endif #include - -#include -#include #include #include @@ -83,36 +73,39 @@ recompute path. Also, it enables more complicated dependencies beyond trees. #include #endif //USE_OLD_DAG -#include #include -#include -#include #include +#include +#include -#include #include +#include -#include "AutoTransaction.h" -#include "Document.h" -#include "Application.h" -#include "DocumentObject.h" -#include "MergeDocuments.h" -#include "ExpressionParser.h" #include - #include #include #include #include -#include #include #include -#include -#include #include #include #include +#include "Document.h" +#include "Application.h" +#include "AutoTransaction.h" +#include "DocumentObserver.h" +#include "DocumentObject.h" +#include "ExpressionParser.h" +#include "GeoFeature.h" +#include "GeoFeatureGroupExtension.h" +#include "Link.h" +#include "MergeDocuments.h" +#include "Origin.h" +#include "OriginGroupExtension.h" +#include "Transactions.h" + #ifdef _MSC_VER #include #endif @@ -121,14 +114,6 @@ recompute path. Also, it enables more complicated dependencies beyond trees. #include #include -#include "Application.h" -#include "Transactions.h" -#include "GeoFeatureGroupExtension.h" -#include "Origin.h" -#include "OriginGroupExtension.h" -#include "Link.h" -#include "DocumentObserver.h" -#include "GeoFeature.h" FC_LOG_LEVEL_INIT("App", true, true, true) diff --git a/src/App/Document.h b/src/App/Document.h index 9ca8bc97e8..1ae1844fd6 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -23,21 +23,16 @@ #ifndef APP_DOCUMENT_H #define APP_DOCUMENT_H -#include -#include -#include #include +#include #include "PropertyContainer.h" -#include "PropertyStandard.h" #include "PropertyLinks.h" +#include "PropertyStandard.h" #include -#include #include -#include - -#include +#include namespace Base { class Writer; diff --git a/src/App/DocumentObject.cpp b/src/App/DocumentObject.cpp index f6c09bc764..ca3835c4c4 100644 --- a/src/App/DocumentObject.cpp +++ b/src/App/DocumentObject.cpp @@ -24,25 +24,20 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - -#include -#include +#include #include -#include +#include +#include #include "Application.h" #include "Document.h" #include "DocumentObject.h" -#include "DocumentObjectGroup.h" -#include "PropertyLinks.h" -#include "PropertyGeo.h" -#include "PropertyExpressionEngine.h" #include "DocumentObjectExtension.h" +#include "DocumentObjectGroup.h" #include "GeoFeatureGroupExtension.h" -#include -#include +#include "PropertyExpressionEngine.h" +#include "PropertyLinks.h" + FC_LOG_LEVEL_INIT("App",true,true) diff --git a/src/App/DocumentObject.h b/src/App/DocumentObject.h index b747d73eca..eec28a5396 100644 --- a/src/App/DocumentObject.h +++ b/src/App/DocumentObject.h @@ -26,17 +26,13 @@ #define APP_DOCUMENTOBJECT_H #include -#include -#include #include - -#include +#include +#include #include -#include -#include #include -#include +#include namespace App { diff --git a/src/App/DocumentObjectExtension.cpp b/src/App/DocumentObjectExtension.cpp index 7af443a575..adf670baf9 100644 --- a/src/App/DocumentObjectExtension.cpp +++ b/src/App/DocumentObjectExtension.cpp @@ -23,11 +23,6 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -# include -#endif - #include "DocumentObjectExtension.h" #include "DocumentObjectExtensionPy.h" diff --git a/src/App/DocumentObjectExtension.h b/src/App/DocumentObjectExtension.h index 66b2d5af96..9ec695ad7a 100644 --- a/src/App/DocumentObjectExtension.h +++ b/src/App/DocumentObjectExtension.h @@ -24,7 +24,6 @@ #ifndef APP_DOCUMENTOBJECTEXTENSION_H #define APP_DOCUMENTOBJECTEXTENSION_H -#include "Extension.h" #include "DocumentObject.h" namespace App { diff --git a/src/App/DocumentObjectExtensionPyImp.cpp b/src/App/DocumentObjectExtensionPyImp.cpp index 8fa948b42d..468220deb9 100644 --- a/src/App/DocumentObjectExtensionPyImp.cpp +++ b/src/App/DocumentObjectExtensionPyImp.cpp @@ -23,10 +23,6 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif - // inclution of the generated files (generated out of PropertyContainerPy.xml) #include "DocumentObjectExtensionPy.h" #include "DocumentObjectExtensionPy.cpp" diff --git a/src/App/DocumentObjectFileIncluded.cpp b/src/App/DocumentObjectFileIncluded.cpp index a7e0516141..f4e9edaae5 100644 --- a/src/App/DocumentObjectFileIncluded.cpp +++ b/src/App/DocumentObjectFileIncluded.cpp @@ -23,11 +23,7 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "DocumentObjectFileIncluded.h" -#include "Document.h" using namespace App; diff --git a/src/App/DocumentObjectFileIncluded.h b/src/App/DocumentObjectFileIncluded.h index 2c5d4a037a..b68c3048d4 100644 --- a/src/App/DocumentObjectFileIncluded.h +++ b/src/App/DocumentObjectFileIncluded.h @@ -28,7 +28,6 @@ #include "PropertyFile.h" - namespace App { diff --git a/src/App/DocumentObjectGroup.cpp b/src/App/DocumentObjectGroup.cpp index deb985984a..4a09427fd5 100644 --- a/src/App/DocumentObjectGroup.cpp +++ b/src/App/DocumentObjectGroup.cpp @@ -23,12 +23,8 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "DocumentObjectGroup.h" #include "DocumentObjectGroupPy.h" -#include "Document.h" #include "FeaturePythonPyImp.h" using namespace App; diff --git a/src/App/DocumentObjectGroup.h b/src/App/DocumentObjectGroup.h index c52b0146db..fa658782d2 100644 --- a/src/App/DocumentObjectGroup.h +++ b/src/App/DocumentObjectGroup.h @@ -24,11 +24,9 @@ #ifndef APP_DOCUMENTOBJECTGROUP_H #define APP_DOCUMENTOBJECTGROUP_H -#include "FeaturePython.h" #include "DocumentObject.h" -#include "PropertyLinks.h" +#include "FeaturePython.h" #include "GroupExtension.h" -#include namespace App diff --git a/src/App/DocumentObjectGroupPyImp.cpp b/src/App/DocumentObjectGroupPyImp.cpp index 821fc99785..a5d4ac9d46 100644 --- a/src/App/DocumentObjectGroupPyImp.cpp +++ b/src/App/DocumentObjectGroupPyImp.cpp @@ -24,8 +24,6 @@ #include "PreCompiled.h" #include "DocumentObjectGroup.h" -#include "Document.h" -#include // inclusion of the generated files (generated out of DocumentObjectGroupPy.xml) #include "DocumentObjectGroupPy.h" diff --git a/src/App/DocumentObjectPyImp.cpp b/src/App/DocumentObjectPyImp.cpp index e40edb4e7b..387be86763 100644 --- a/src/App/DocumentObjectPyImp.cpp +++ b/src/App/DocumentObjectPyImp.cpp @@ -24,12 +24,14 @@ #include #include + #include "DocumentObject.h" #include "Document.h" #include "ExpressionParser.h" #include "GeoFeature.h" -#include "GroupExtension.h" #include "GeoFeatureGroupExtension.h" +#include "GroupExtension.h" + // inclusion of the generated files (generated out of DocumentObjectPy.xml) #include diff --git a/src/App/DocumentObserver.cpp b/src/App/DocumentObserver.cpp index 927f7d7c8d..1349a524f4 100644 --- a/src/App/DocumentObserver.cpp +++ b/src/App/DocumentObserver.cpp @@ -23,17 +23,12 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -# include -#endif - #include + #include "Application.h" -#include "Document.h" -#include "DocumentObject.h" -#include "DocumentObserver.h" #include "ComplexGeoData.h" +#include "Document.h" +#include "DocumentObserver.h" #include "GeoFeature.h" using namespace App; diff --git a/src/App/DocumentObserver.h b/src/App/DocumentObserver.h index 4f1a47958f..514bdf8387 100644 --- a/src/App/DocumentObserver.h +++ b/src/App/DocumentObserver.h @@ -26,8 +26,9 @@ #include #include -#include #include +#include + namespace App { diff --git a/src/App/DocumentObserverPython.cpp b/src/App/DocumentObserverPython.cpp index 957c350784..71b113084c 100644 --- a/src/App/DocumentObserverPython.cpp +++ b/src/App/DocumentObserverPython.cpp @@ -23,16 +23,11 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif - #include "Application.h" #include "Document.h" #include "DocumentObject.h" #include "DocumentObserverPython.h" -#include -#include + using namespace App; namespace bp = boost::placeholders; diff --git a/src/App/DocumentObserverPython.h b/src/App/DocumentObserverPython.h index 3c9957836b..95aee29b98 100644 --- a/src/App/DocumentObserverPython.h +++ b/src/App/DocumentObserverPython.h @@ -24,12 +24,6 @@ #ifndef APP_DOCUMENTOBSERVERPYTHON_H #define APP_DOCUMENTOBSERVERPYTHON_H -#include - -#include -#include -#include - namespace App { diff --git a/src/App/DocumentPyImp.cpp b/src/App/DocumentPyImp.cpp index 3aef36a07b..e00367cbd8 100644 --- a/src/App/DocumentPyImp.cpp +++ b/src/App/DocumentPyImp.cpp @@ -23,16 +23,12 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif +#include #include "Document.h" -#include #include "DocumentObject.h" #include "DocumentObjectPy.h" #include "MergeDocuments.h" -#include "PropertyLinks.h" // inclusion of the generated files (generated By DocumentPy.xml) #include "DocumentPy.h"