From 10e71da57fadfb28a40b5697d6a7076f09f54a2b Mon Sep 17 00:00:00 2001 From: Uwe Date: Mon, 3 Oct 2022 03:57:21 +0200 Subject: [PATCH] [FEM] Dlg* etc.: remove unused includes - also sort includes --- src/Mod/Fem/Gui/AbaqusHighlighter.cpp | 3 +-- src/Mod/Fem/Gui/ActiveAnalysisObserver.cpp | 7 ++++--- src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h | 4 ++-- src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h | 4 ++-- src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h | 4 ++-- src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h | 4 ++-- src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h | 4 ++-- src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h | 4 ++-- src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h | 4 ++-- src/Mod/Fem/Gui/FemSelectionGate.cpp | 4 +--- src/Mod/Fem/Gui/FemSettings.cpp | 6 ++++-- src/Mod/Fem/Gui/PropertyFemMeshItem.cpp | 6 +++--- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Mod/Fem/Gui/AbaqusHighlighter.cpp b/src/Mod/Fem/Gui/AbaqusHighlighter.cpp index cbfb7e8eb8..bd7a6ed08a 100644 --- a/src/Mod/Fem/Gui/AbaqusHighlighter.cpp +++ b/src/Mod/Fem/Gui/AbaqusHighlighter.cpp @@ -20,15 +20,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include # include #endif #include "AbaqusHighlighter.h" + using namespace FemGui; /** diff --git a/src/Mod/Fem/Gui/ActiveAnalysisObserver.cpp b/src/Mod/Fem/Gui/ActiveAnalysisObserver.cpp index 53434f40c5..8753994762 100644 --- a/src/Mod/Fem/Gui/ActiveAnalysisObserver.cpp +++ b/src/Mod/Fem/Gui/ActiveAnalysisObserver.cpp @@ -20,17 +20,18 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#include "ActiveAnalysisObserver.h" + #include #include #include #include -using namespace FemGui; +#include "ActiveAnalysisObserver.h" +using namespace FemGui; + ActiveAnalysisObserver* ActiveAnalysisObserver::inst = nullptr; ActiveAnalysisObserver* ActiveAnalysisObserver::instance() diff --git a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h index 8afdd7fc01..5d53a0c6b2 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemCcxImp.h @@ -23,12 +23,12 @@ * * ***************************************************************************/ - #ifndef FEMGUI_DLGSETTINGSFEMCCXIMP_H #define FEMGUI_DLGSETTINGSFEMCCXIMP_H -#include #include +#include + namespace FemGui { class Ui_DlgSettingsFemCcxImp; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h b/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h index 20ffff78fb..e42b65e82b 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemElmerImp.h @@ -22,12 +22,12 @@ * * ***************************************************************************/ - #ifndef FEMGUI_DLGSETTINGSFEMELMERIMP_H #define FEMGUI_DLGSETTINGSFEMELMERIMP_H -#include #include +#include + namespace FemGui { class Ui_DlgSettingsFemElmerImp; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h b/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h index ee6a01b8b7..23f5d57b85 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemGeneralImp.h @@ -22,12 +22,12 @@ * * ***************************************************************************/ - #ifndef FEMGUI_DLGSETTINGSFEMGENERALIMP_H #define FEMGUI_DLGSETTINGSFEMGENERALIMP_H -#include #include +#include + namespace FemGui { class Ui_DlgSettingsFemGeneralImp; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h b/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h index 5ef7e9375f..7d9b6cf1a5 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemGmshImp.h @@ -22,12 +22,12 @@ * * ***************************************************************************/ - #ifndef FEMGUI_DLGSETTINGSFEMGMSHIMP_H #define FEMGUI_DLGSETTINGSFEMGMSHIMP_H -#include #include +#include + namespace FemGui { class Ui_DlgSettingsFemGmshImp; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h b/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h index 792b015750..829901fa84 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemMaterialImp.h @@ -22,12 +22,12 @@ * * ***************************************************************************/ - #ifndef FEMGUI_DLGSETTINGSFEMMATERIALIMP_H #define FEMGUI_DLGSETTINGSFEMMATERIALIMP_H -#include #include +#include + namespace FemGui { class Ui_DlgSettingsFemMaterialImp; diff --git a/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h b/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h index e58908ed0b..5aa0c53d9b 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemMystranImp.h @@ -22,12 +22,12 @@ * * ***************************************************************************/ - #ifndef FEMGUI_DLGSETTINGSFEMMYSTRANIMP_H #define FEMGUI_DLGSETTINGSFEMMYSTRANIMP_H -#include #include +#include + namespace FemGui { diff --git a/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h b/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h index e90e6c045b..1b82c033e8 100644 --- a/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h +++ b/src/Mod/Fem/Gui/DlgSettingsFemZ88Imp.h @@ -22,12 +22,12 @@ * * ***************************************************************************/ - #ifndef FEMGUI_DLGSETTINGSFEMZ88IMP_H #define FEMGUI_DLGSETTINGSFEMZ88IMP_H -#include #include +#include + namespace FemGui { class Ui_DlgSettingsFemZ88Imp; diff --git a/src/Mod/Fem/Gui/FemSelectionGate.cpp b/src/Mod/Fem/Gui/FemSelectionGate.cpp index e1d1781f18..0f8ce2411b 100644 --- a/src/Mod/Fem/Gui/FemSelectionGate.cpp +++ b/src/Mod/Fem/Gui/FemSelectionGate.cpp @@ -22,11 +22,9 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -#endif - #include "FemSelectionGate.h" + using namespace FemGui; using namespace Gui; diff --git a/src/Mod/Fem/Gui/FemSettings.cpp b/src/Mod/Fem/Gui/FemSettings.cpp index 64e6dff4c3..61d83144a8 100644 --- a/src/Mod/Fem/Gui/FemSettings.cpp +++ b/src/Mod/Fem/Gui/FemSettings.cpp @@ -20,11 +20,13 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#include "FemSettings.h" + #include +#include "FemSettings.h" + + using namespace FemGui; diff --git a/src/Mod/Fem/Gui/PropertyFemMeshItem.cpp b/src/Mod/Fem/Gui/PropertyFemMeshItem.cpp index ff21e2134e..1be3e60c54 100644 --- a/src/Mod/Fem/Gui/PropertyFemMeshItem.cpp +++ b/src/Mod/Fem/Gui/PropertyFemMeshItem.cpp @@ -20,17 +20,17 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #ifndef _PreComp_ -# include # include +# include #endif -#include "PropertyFemMeshItem.h" #include +#include "PropertyFemMeshItem.h" + using namespace FemGui;