From e8d64631ade4cdc4972139b9ca6780a9f7a595bc Mon Sep 17 00:00:00 2001 From: Uwe Date: Thu, 24 Mar 2022 15:35:32 +0100 Subject: [PATCH] [FEM] App headers: remove unused headers --- src/Mod/Fem/App/FemAnalysis.h | 2 +- src/Mod/Fem/App/FemConstraintFixed.h | 3 +-- src/Mod/Fem/App/FemConstraintPulley.h | 5 ++--- src/Mod/Fem/App/FemMesh.cpp | 1 - src/Mod/Fem/App/FemMesh.h | 4 +--- src/Mod/Fem/App/FemMeshObject.h | 4 +--- src/Mod/Fem/App/FemMeshShapeNetgenObject.h | 5 +---- src/Mod/Fem/App/FemPostFilter.h | 21 +++++++++------------ src/Mod/Fem/App/FemPostFunction.h | 13 +++++++------ src/Mod/Fem/App/FemPostPipeline.h | 7 +++---- src/Mod/Fem/App/FemResultObject.h | 7 +------ src/Mod/Fem/App/FemSetElementsObject.h | 3 +-- src/Mod/Fem/App/FemSetFacesObject.h | 5 +---- src/Mod/Fem/App/FemSetGeometryObject.h | 3 +-- src/Mod/Fem/App/FemVTKTools.cpp | 1 + src/Mod/Fem/App/FemVTKTools.h | 18 +++++------------- src/Mod/Fem/App/PropertyPostDataObject.h | 7 ++++--- 17 files changed, 40 insertions(+), 69 deletions(-) diff --git a/src/Mod/Fem/App/FemAnalysis.h b/src/Mod/Fem/App/FemAnalysis.h index 3e5a034194..38b012fe64 100644 --- a/src/Mod/Fem/App/FemAnalysis.h +++ b/src/Mod/Fem/App/FemAnalysis.h @@ -24,7 +24,7 @@ #define Fem_FemAnalysis_H #include -#include +#include #include #include diff --git a/src/Mod/Fem/App/FemConstraintFixed.h b/src/Mod/Fem/App/FemConstraintFixed.h index a32ce3df7a..7731f1a9aa 100644 --- a/src/Mod/Fem/App/FemConstraintFixed.h +++ b/src/Mod/Fem/App/FemConstraintFixed.h @@ -21,16 +21,15 @@ * * ***************************************************************************/ - #ifndef FEM_CONSTRAINTFIXED_H #define FEM_CONSTRAINTFIXED_H #include -#include #include #include "FemConstraint.h" + namespace Fem { diff --git a/src/Mod/Fem/App/FemConstraintPulley.h b/src/Mod/Fem/App/FemConstraintPulley.h index f7a689a585..9d37df73ac 100644 --- a/src/Mod/Fem/App/FemConstraintPulley.h +++ b/src/Mod/Fem/App/FemConstraintPulley.h @@ -21,16 +21,15 @@ * * ***************************************************************************/ - #ifndef FEM_CONSTRAINTPulley_H #define FEM_CONSTRAINTPulley_H #include -#include -#include +#include #include "FemConstraintGear.h" + namespace Fem { diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index 840d96ca23..c0aa97627c 100644 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -49,7 +49,6 @@ # include # include # include -//# include # include # include # include diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h index 1519fdccb6..9b054e1301 100644 --- a/src/Mod/Fem/App/FemMesh.h +++ b/src/Mod/Fem/App/FemMesh.h @@ -20,12 +20,10 @@ * * ***************************************************************************/ - #ifndef FEM_FEMMESH_H #define FEM_FEMMESH_H #include -#include #include #include @@ -33,7 +31,7 @@ #include #include #include -#include + class SMESH_Gen; class SMESH_Mesh; diff --git a/src/Mod/Fem/App/FemMeshObject.h b/src/Mod/Fem/App/FemMeshObject.h index 718324b778..acc5f28094 100644 --- a/src/Mod/Fem/App/FemMeshObject.h +++ b/src/Mod/Fem/App/FemMeshObject.h @@ -20,18 +20,16 @@ * * ***************************************************************************/ - #ifndef Fem_FemMeshObject_H #define Fem_FemMeshObject_H #include #include -#include -#include #include "FemMesh.h" #include "FemMeshProperty.h" + namespace Fem { diff --git a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h index 01ecb36f49..38b8c418c6 100644 --- a/src/Mod/Fem/App/FemMeshShapeNetgenObject.h +++ b/src/Mod/Fem/App/FemMeshShapeNetgenObject.h @@ -20,14 +20,11 @@ * * ***************************************************************************/ - #ifndef Fem_FemMeshShapeNetgenObject_H #define Fem_FemMeshShapeNetgenObject_H - -#include "FemMesh.h" -#include "FemMeshShapeObject.h" #include +#include "FemMeshShapeObject.h" namespace Fem { diff --git a/src/Mod/Fem/App/FemPostFilter.h b/src/Mod/Fem/App/FemPostFilter.h index 90811160ef..23828b80c5 100644 --- a/src/Mod/Fem/App/FemPostFilter.h +++ b/src/Mod/Fem/App/FemPostFilter.h @@ -20,25 +20,22 @@ * * ***************************************************************************/ - #ifndef Fem_FemPostFilter_H #define Fem_FemPostFilter_H -#include "FemPostObject.h" -#include - -#include -#include -#include -#include -#include -#include -#include #include +#include #include #include #include -#include +#include +#include +#include + +#include + +#include "FemPostObject.h" + namespace Fem { diff --git a/src/Mod/Fem/App/FemPostFunction.h b/src/Mod/Fem/App/FemPostFunction.h index 3e74812a79..8fc94e246c 100644 --- a/src/Mod/Fem/App/FemPostFunction.h +++ b/src/Mod/Fem/App/FemPostFunction.h @@ -20,18 +20,19 @@ * * ***************************************************************************/ - #ifndef Fem_FemPostFunction_H #define Fem_FemPostFunction_H -#include "FemPostObject.h" -#include - -#include +#include #include #include #include -#include +#include + +#include + +#include "FemPostObject.h" + namespace Fem { diff --git a/src/Mod/Fem/App/FemPostPipeline.h b/src/Mod/Fem/App/FemPostPipeline.h index a01246b171..0f9ed8c095 100644 --- a/src/Mod/Fem/App/FemPostPipeline.h +++ b/src/Mod/Fem/App/FemPostPipeline.h @@ -20,17 +20,16 @@ * * ***************************************************************************/ - #ifndef Fem_FemPostPipeline_H #define Fem_FemPostPipeline_H -#include "FemResultObject.h" -#include "FemPostObject.h" #include "FemPostFilter.h" #include "FemPostFunction.h" +#include "FemPostObject.h" +#include "FemResultObject.h" #include -#include + namespace Fem { diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h index b3f778b665..2e6ed6f2ee 100644 --- a/src/Mod/Fem/App/FemResultObject.h +++ b/src/Mod/Fem/App/FemResultObject.h @@ -20,16 +20,15 @@ * * ***************************************************************************/ - #ifndef Fem_FemResultObject_H #define Fem_FemResultObject_H #include -#include #include #include #include + namespace Fem { /// Father of all result data in a Fem Analysis @@ -51,8 +50,6 @@ public: App::PropertyFloatList Stats; /// Displacement vectors of analysis - - /// returns the type name of the ViewProvider virtual const char* getViewProviderName(void) const { return "FemGui::ViewProviderResult"; @@ -62,8 +59,6 @@ public: } virtual short mustExecute(void) const; virtual PyObject *getPyObject(void); - - }; typedef App::FeaturePythonT FemResultObjectPython; diff --git a/src/Mod/Fem/App/FemSetElementsObject.h b/src/Mod/Fem/App/FemSetElementsObject.h index 87881187a5..07bcb2bca1 100644 --- a/src/Mod/Fem/App/FemSetElementsObject.h +++ b/src/Mod/Fem/App/FemSetElementsObject.h @@ -20,14 +20,13 @@ * * ***************************************************************************/ - #ifndef Fem_FemSetElementsObjec_H #define Fem_FemSetElementsObjec_H #include -#include #include "FemSetObject.h" + namespace Fem { diff --git a/src/Mod/Fem/App/FemSetFacesObject.h b/src/Mod/Fem/App/FemSetFacesObject.h index 1b5dc6a387..3f7b6117c3 100644 --- a/src/Mod/Fem/App/FemSetFacesObject.h +++ b/src/Mod/Fem/App/FemSetFacesObject.h @@ -20,14 +20,13 @@ * * ***************************************************************************/ - #ifndef Fem_FemSetFacesObject_H #define Fem_FemSetFacesObject_H #include -#include #include "FemSetObject.h" + namespace Fem { @@ -49,8 +48,6 @@ public: } virtual short mustExecute(void) const; virtual PyObject *getPyObject(void); - - }; } //namespace Fem diff --git a/src/Mod/Fem/App/FemSetGeometryObject.h b/src/Mod/Fem/App/FemSetGeometryObject.h index 3ace740d57..42170c2976 100644 --- a/src/Mod/Fem/App/FemSetGeometryObject.h +++ b/src/Mod/Fem/App/FemSetGeometryObject.h @@ -20,14 +20,13 @@ * * ***************************************************************************/ - #ifndef Fem_FemSetGeometryObject_H #define Fem_FemSetGeometryObject_H #include -#include #include "FemSetObject.h" + namespace Fem { diff --git a/src/Mod/Fem/App/FemVTKTools.cpp b/src/Mod/Fem/App/FemVTKTools.cpp index 5c969433f4..c44fc04c38 100644 --- a/src/Mod/Fem/App/FemVTKTools.cpp +++ b/src/Mod/Fem/App/FemVTKTools.cpp @@ -87,6 +87,7 @@ #include "FemVTKTools.h" #include "FemMeshProperty.h" #include "FemAnalysis.h" +#include "FemResultObject.h" namespace Fem { diff --git a/src/Mod/Fem/App/FemVTKTools.h b/src/Mod/Fem/App/FemVTKTools.h index e22c844790..87f5bb1491 100644 --- a/src/Mod/Fem/App/FemVTKTools.h +++ b/src/Mod/Fem/App/FemVTKTools.h @@ -20,24 +20,20 @@ * * ***************************************************************************/ - #ifndef FEM_VTK_TOOLS_H #define FEM_VTK_TOOLS_H -#include "FemMesh.h" -#include "FemMeshObject.h" -#include -#include "FemResultObject.h" - -#include #include +#include #include -#include +#include + +#include "FemMeshObject.h" + namespace Fem { - // utility class to import/export read/write vtk mesh and result class FemExport FemVTKTools { @@ -54,8 +50,6 @@ namespace Fem // extract data from a FreeCAD FEM result object and fill a vtkUnstructuredGrid object with that data (needed by writeResult) static void exportFreeCADResult(const App::DocumentObject* result, vtkSmartPointer grid); - - // FemMesh read from vtkUnstructuredGrid data file static FemMesh* readVTKMesh(const char* filename, FemMesh* mesh); @@ -67,9 +61,7 @@ namespace Fem // write FemResult (activeObject if res= NULL) to vtkUnstructuredGrid dataset file static void writeResult(const char* filename, const App::DocumentObject* res = nullptr); - }; } #endif //FEM_VTK_TOOLS_H - diff --git a/src/Mod/Fem/App/PropertyPostDataObject.h b/src/Mod/Fem/App/PropertyPostDataObject.h index 93c4347785..0b00a65892 100644 --- a/src/Mod/Fem/App/PropertyPostDataObject.h +++ b/src/Mod/Fem/App/PropertyPostDataObject.h @@ -20,16 +20,17 @@ * * ***************************************************************************/ - #ifndef FEM_PROPERTYPOSTDATASET_H #define FEM_PROPERTYPOSTDATASET_H -#include -#include #include #include +#include + +#include #include + namespace Fem {