From c8f0338ae198eb4cd46c93a8a3a9d296b121cbf7 Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 3 Oct 2022 15:01:37 +0200 Subject: [PATCH] [FEM] ViewProviderFem*: remove unused includes - also sort includes --- src/Mod/Fem/Gui/TaskFemConstraint.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp | 3 +-- src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp | 7 ------- src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp | 11 ++++------- src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp | 5 ----- src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp | 11 ++--------- src/Mod/Fem/Gui/ViewProviderFemPostFunction.h | 1 + src/Mod/Fem/Gui/ViewProviderFemPostObject.h | 2 +- src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h | 5 +++-- src/Mod/Fem/Gui/ViewProviderFemPostPipelinePyImp.cpp | 4 ---- 10 files changed, 13 insertions(+), 38 deletions(-) diff --git a/src/Mod/Fem/Gui/TaskFemConstraint.cpp b/src/Mod/Fem/Gui/TaskFemConstraint.cpp index e1c00242a8..1e79a13588 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraint.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraint.cpp @@ -132,7 +132,7 @@ void TaskFemConstraint::setSelection(QListWidgetItem* item) { ItemName.erase(0, pos + delimiter.length()); // clear existing selection Gui::Selection().clearSelection(); - // highligh the selected item + // highlight the selected item Gui::Selection().addSelection(docName.c_str(), objName.c_str(), ItemName.c_str(), 0, 0, 0); } diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp index d7df64e361..7c652f9e28 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshPyImp.cpp @@ -6,12 +6,11 @@ # include #endif -#include #include +#include #include #include "ViewProviderFemMesh.h" - // inclusion of the generated files (generated out of ViewProviderFemMeshPy.xml) #include "ViewProviderFemMeshPy.h" #include "ViewProviderFemMeshPy.cpp" diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp index 4f0c9000c2..0fb21766bb 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShape.cpp @@ -20,22 +20,15 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "ViewProviderFemMeshShape.h" using namespace FemGui; - - PROPERTY_SOURCE(FemGui::ViewProviderFemMeshShape, FemGui::ViewProviderFemMesh) - ViewProviderFemMeshShape::ViewProviderFemMeshShape() { diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp index 0128e80356..d734c31784 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshShapeNetgen.cpp @@ -20,28 +20,25 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include # include # include #endif -#include "ViewProviderFemMeshShapeNetgen.h" -#include "TaskDlgMeshShapeNetgen.h" - #include #include #include +#include "ViewProviderFemMeshShapeNetgen.h" +#include "TaskDlgMeshShapeNetgen.h" + using namespace FemGui; - /* TRANSLATOR FemGui::ViewProviderFemMeshShapeNetgen */ PROPERTY_SOURCE(FemGui::ViewProviderFemMeshShapeNetgen, FemGui::ViewProviderFemMeshShape) @@ -59,7 +56,7 @@ ViewProviderFemMeshShapeNetgen::~ViewProviderFemMeshShapeNetgen() void ViewProviderFemMeshShapeNetgen::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - QAction* act = menu->addAction(QObject::tr("Meshing"), receiver, member); + QAction *act = menu->addAction(QObject::tr("Meshing"), receiver, member); act->setData(QVariant((int)ViewProvider::Default)); } diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp index 3e1614dd47..cc9ce29893 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp @@ -22,10 +22,6 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif - #include #include "ViewProviderFemPostFilter.h" @@ -34,7 +30,6 @@ using namespace FemGui; - PROPERTY_SOURCE(FemGui::ViewProviderFemPostClip, FemGui::ViewProviderFemPostObject) ViewProviderFemPostClip::ViewProviderFemPostClip() { diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp index 663dc027aa..0746dececa 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp @@ -23,8 +23,9 @@ #include "PreCompiled.h" #ifndef _PreComp_ +# include + # include -# include # include # include # include @@ -40,14 +41,9 @@ # include # include # include - -# include - -# include #endif #include -#include #include #include #include @@ -56,11 +52,8 @@ #include #include #include -#include -#include #include "ViewProviderFemPostFunction.h" -#include "ActiveAnalysisObserver.h" #include "FemSettings.h" #include "TaskPostBoxes.h" diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h index 976d60481f..ed06fc7051 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h @@ -26,6 +26,7 @@ #include #include #include + #include #include diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h index f1fd646a12..8519704fe1 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h @@ -30,8 +30,8 @@ #include #include #include -#include #include +#include #include class SoIndexedPointSet; diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h index be7eff2ddd..6d029dee5d 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.h @@ -20,14 +20,15 @@ * * ***************************************************************************/ - #ifndef FEM_VIEWPROVIDERFEMPOSTPIPELINE_H #define FEM_VIEWPROVIDERFEMPOSTPIPELINE_H -#include "ViewProviderFemPostObject.h" #include #include +#include "ViewProviderFemPostObject.h" + + namespace FemGui { diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePyImp.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePyImp.cpp index 9ca2c15724..55fa595100 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePyImp.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePyImp.cpp @@ -22,11 +22,7 @@ #include "PreCompiled.h" -#include -#include - #include "ViewProviderFemPostPipeline.h" - // inclusion of the generated files (generated out of ViewProviderFemPostPipelinePy.xml) #include "ViewProviderFemPostPipelinePy.h" #include "ViewProviderFemPostPipelinePy.cpp"