From 4a2aff82a6494ef3fc497f2fb4bc9183e63cac61 Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 9 Oct 2022 19:14:31 +0200 Subject: [PATCH] [TD] Gui, Dlg*: remove unused includes - also sort includes - also two whitespace changes --- src/App/PropertyExpressionEngine.cpp | 2 +- src/Base/Console.h | 3 --- src/Mod/TechDraw/Gui/DlgPageChooser.cpp | 6 +++--- src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp | 5 ++--- src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h | 4 ++-- .../TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp | 11 ++++------- src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h | 6 +++--- src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.cpp | 3 +-- src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h | 6 +++--- .../TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp | 9 ++------- src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h | 6 +++--- src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp | 12 +----------- src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h | 6 +++--- src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp | 3 +-- src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h | 6 +++--- src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp | 3 +-- src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h | 6 +++--- src/Mod/TechDraw/Gui/DlgTemplateField.cpp | 6 +++--- 18 files changed, 39 insertions(+), 64 deletions(-) diff --git a/src/App/PropertyExpressionEngine.cpp b/src/App/PropertyExpressionEngine.cpp index cb7605af42..904515f688 100644 --- a/src/App/PropertyExpressionEngine.cpp +++ b/src/App/PropertyExpressionEngine.cpp @@ -34,7 +34,7 @@ #include "ExpressionVisitors.h" -FC_LOG_LEVEL_INIT("App",true); +FC_LOG_LEVEL_INIT("App", true); using namespace App; using namespace Base; diff --git a/src/Base/Console.h b/src/Base/Console.h index ce1bd846f0..4360388aa3 100644 --- a/src/Base/Console.h +++ b/src/Base/Console.h @@ -21,9 +21,6 @@ * * ***************************************************************************/ - - - #ifndef BASE_CONSOLE_H #define BASE_CONSOLE_H diff --git a/src/Mod/TechDraw/Gui/DlgPageChooser.cpp b/src/Mod/TechDraw/Gui/DlgPageChooser.cpp index 47318b9638..ae25220f02 100644 --- a/src/Mod/TechDraw/Gui/DlgPageChooser.cpp +++ b/src/Mod/TechDraw/Gui/DlgPageChooser.cpp @@ -19,20 +19,20 @@ * Suite 330, Boston, MA 02111-1307, USA * * * ****************************************************************************/ + #include "PreCompiled.h" #ifndef _PreComp_ -# include -# include # include -# include # include #endif #include #include + #include "DlgPageChooser.h" #include "ui_DlgPageChooser.h" + FC_LOG_LEVEL_INIT("Gui", true, true) using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp index dd9ccd266a..9ae876c2bf 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp @@ -22,12 +22,11 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #include "DlgPrefsTechDrawAdvancedImp.h" -#include -#include +#include "ui_DlgPrefsTechDrawAdvanced.h" + using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h index 8a62ddfa08..cbdb05b32b 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h @@ -21,15 +21,15 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPADVANCED_H #define DRAWINGGUI_DLGPREFSTECHDRAWIMPADVANCED_H +#include #include -#include #include + namespace TechDrawGui { class Ui_DlgPrefsTechDrawAdvancedImp; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp index aeb2a9c7e0..863294f18f 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.cpp @@ -22,19 +22,16 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#include +#include -#include -#include +#include -#include "DrawGuiUtil.h" -#include "PreferencesGui.h" #include "DlgPrefsTechDrawAnnotationImp.h" #include "ui_DlgPrefsTechDrawAnnotation.h" -#include +#include "DrawGuiUtil.h" +#include "PreferencesGui.h" using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h index 77ebd9d422..9514a17626 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotationImp.h @@ -21,14 +21,14 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPANNOTATION_H #define DRAWINGGUI_DLGPREFSTECHDRAWIMPANNOTATION_H -#include +#include #include -#include +#include + namespace TechDrawGui { class Ui_DlgPrefsTechDrawAnnotationImp; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.cpp index a121738e19..0f3336198c 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.cpp @@ -22,12 +22,11 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #include "DlgPrefsTechDrawColorsImp.h" #include "ui_DlgPrefsTechDrawColors.h" -#include + using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h index bad5a33fe2..efbc81d145 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColorsImp.h @@ -21,14 +21,14 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPCOLORS_H #define DRAWINGGUI_DLGPREFSTECHDRAWIMPCOLORS_H -#include +#include #include -#include +#include + namespace TechDrawGui { class Ui_DlgPrefsTechDrawColorsImp; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp index 1b534b4654..6bdf0f0ade 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp @@ -22,19 +22,14 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#include - -#include -#include #include -#include "DrawGuiUtil.h" -#include "PreferencesGui.h" #include "DlgPrefsTechDrawDimensionsImp.h" #include "ui_DlgPrefsTechDrawDimensions.h" +#include "DrawGuiUtil.h" +#include "PreferencesGui.h" using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h index f7da5e0627..44b66bf16e 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.h @@ -21,14 +21,14 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPDIMENSIONS_H #define DRAWINGGUI_DLGPREFSTECHDRAWIMPDIMENSIONS_H -#include +#include #include -#include +#include + namespace TechDrawGui { class Ui_DlgPrefsTechDrawDimensionsImp; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp index 60d8944809..2c1020e5da 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp @@ -22,23 +22,13 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#include -#include -#include -#include - -#include -#include - #include "DlgPrefsTechDrawGeneralImp.h" #include "ui_DlgPrefsTechDrawGeneral.h" -#include - #include "PreferencesGui.h" + using namespace TechDrawGui; using namespace TechDraw; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h index bcb4b95b91..d3b5f46546 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.h @@ -21,14 +21,14 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPGENERAL_H #define DRAWINGGUI_DLGPREFSTECHDRAWIMPGENERAL_H -#include +#include #include -#include +#include + namespace TechDrawGui { class Ui_DlgPrefsTechDrawGeneralImp; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp index 0c46260b06..c8a3c62e7c 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp @@ -22,12 +22,11 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #include "DlgPrefsTechDrawHLRImp.h" #include "ui_DlgPrefsTechDrawHLR.h" -#include + using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h index 2ae48cdb3b..0d27b17a6e 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h @@ -21,14 +21,14 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPHLR_H #define DRAWINGGUI_DLGPREFSTECHDRAWIMPHLR_H -#include +#include #include -#include +#include + namespace TechDrawGui { class Ui_DlgPrefsTechDrawHLRImp; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp index fd5a74c0d0..30e70cba8f 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp @@ -22,12 +22,11 @@ * * ***************************************************************************/ - #include "PreCompiled.h" #include "DlgPrefsTechDrawScaleImp.h" #include "ui_DlgPrefsTechDrawScale.h" -#include + using namespace TechDrawGui; diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h index bae0d1b3d3..08ea177f48 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h @@ -21,14 +21,14 @@ * * ***************************************************************************/ - #ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPSCALE_H #define DRAWINGGUI_DLGPREFSTECHDRAWIMPSCALE_H -#include +#include #include -#include +#include + namespace TechDrawGui { class Ui_DlgPrefsTechDrawScaleImp; diff --git a/src/Mod/TechDraw/Gui/DlgTemplateField.cpp b/src/Mod/TechDraw/Gui/DlgTemplateField.cpp index 4bf0836ee6..238004cbbb 100644 --- a/src/Mod/TechDraw/Gui/DlgTemplateField.cpp +++ b/src/Mod/TechDraw/Gui/DlgTemplateField.cpp @@ -20,11 +20,11 @@ * * ***************************************************************************/ - #include "PreCompiled.h" -#include + #include "DlgTemplateField.h" -#include +#include "ui_DlgTemplateField.h" + using namespace TechDrawGui;