[Sketch] Gui: Sketch - So: remove unused headers

- also some sorting
2022-12-13 02:22:16 +01:00
parent 2e1ec82930
commit 44d464251b
14 changed files with 46 additions and 76 deletions
--- a/src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketchMirrorDialog.cpp
@@ -21,20 +21,15 @@
 ***************************************************************************/

 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QPixmap>
 # include <QDialog>
 #endif

-#include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>

 #include "ui_SketchMirrorDialog.h"
 #include "SketchMirrorDialog.h"
-#include <Mod/Sketcher/App/SketchObject.h>
+

 using namespace SketcherGui;

--- a/src/Mod/Sketcher/Gui/SketchMirrorDialog.h
+++ b/src/Mod/Sketcher/Gui/SketchMirrorDialog.h
@@ -24,7 +24,9 @@
 #define SKETCHERGUI_SketchMirrorDialog_H

 #include <QDialog>
-#include "../App/Constraint.h"
+
+#include <Mod/Sketcher/App/GeoEnum.h>
+

 namespace SketcherGui {

--- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp
@@ -21,20 +21,17 @@
 ***************************************************************************/

 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QPixmap>
 # include <QDialog>
 #endif

 #include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>

 #include "ui_SketchOrientationDialog.h"
 #include "SketchOrientationDialog.h"

+
 using namespace SketcherGui;

 SketchOrientationDialog::SketchOrientationDialog()
--- a/src/Mod/Sketcher/Gui/SketchOrientationDialog.h
+++ b/src/Mod/Sketcher/Gui/SketchOrientationDialog.h
@@ -23,10 +23,12 @@
 #ifndef SKETCHERGUI_SketchOrientationDialog_H
 #define SKETCHERGUI_SketchOrientationDialog_H

-#include <Base/Placement.h>
 #include <QDialog>
+
+#include <Base/Placement.h>
 #include <Mod/Sketcher/SketcherGlobal.h>

+
 namespace SketcherGui {

 class Ui_SketchOrientationDialog;
--- a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.cpp
@@ -21,20 +21,16 @@
 ***************************************************************************/

 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QPixmap>
 # include <QDialog>
 #endif

-#include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>

 #include "ui_SketchRectangularArrayDialog.h"
 #include "SketchRectangularArrayDialog.h"

+
 using namespace SketcherGui;

 SketchRectangularArrayDialog::SketchRectangularArrayDialog()
--- a/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h
+++ b/src/Mod/Sketcher/Gui/SketchRectangularArrayDialog.h
@@ -23,9 +23,9 @@
 #ifndef SKETCHERGUI_SketchRectangularArrayDialog_H
 #define SKETCHERGUI_SketchRectangularArrayDialog_H

-#include <Base/Placement.h>
 #include <QDialog>

+
 namespace SketcherGui {

 class Ui_SketchRectangularArrayDialog;
--- a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp
+++ b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.cpp
@@ -21,20 +21,16 @@
 ***************************************************************************/

 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <QPixmap>
 # include <QDialog>
 #endif

-#include <Gui/BitmapFactory.h>
 #include <Gui/MainWindow.h>
-#include <Base/Tools.h>
-#include <Base/UnitsApi.h>

 #include "ui_SketcherRegularPolygonDialog.h"
 #include "SketcherRegularPolygonDialog.h"

+
 using namespace SketcherGui;

 SketcherRegularPolygonDialog::SketcherRegularPolygonDialog()
--- a/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h
+++ b/src/Mod/Sketcher/Gui/SketcherRegularPolygonDialog.h
@@ -23,9 +23,9 @@
 #ifndef SKETCHERGUI_SketcherRegularPolygonDialog_H
 #define SKETCHERGUI_SketcherRegularPolygonDialog_H

-#include <Base/Placement.h>
 #include <QDialog>

+
 namespace SketcherGui {

 class Ui_SketcherRegularPolygonDialog;
--- a/src/Mod/Sketcher/Gui/SketcherSettings.cpp
+++ b/src/Mod/Sketcher/Gui/SketcherSettings.cpp
@@ -20,26 +20,24 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h"
-
 #ifndef _PreComp_
+# include <QMessageBox>
 # include <QPainter>
 # include <QPixmap>
-# include <QMessageBox>
 #endif

+#include <App/Application.h>
+#include <Base/Console.h>
+#include <Base/Interpreter.h>
+#include <Gui/Command.h>
+
 #include "SketcherSettings.h"
 #include "ui_SketcherSettings.h"
-#include "ui_SketcherSettingsDisplay.h"
 #include "ui_SketcherSettingsColors.h"
+#include "ui_SketcherSettingsDisplay.h"
 #include "TaskSketcherGeneral.h"
-#include <Base/Console.h>
-#include <Base/Interpreter.h>
-#include <App/Application.h>
-#include <Gui/PrefWidgets.h>
-#include <Gui/Inventor/MarkerBitmaps.h>
-#include <Gui/Command.h>
+

 using namespace SketcherGui;

--- a/src/Mod/Sketcher/Gui/SketcherSettings.h
+++ b/src/Mod/Sketcher/Gui/SketcherSettings.h
@@ -20,12 +20,12 @@
 *                                                                         *
 ***************************************************************************/

-
 #ifndef SKETCHERGUI_SKETCHERSETTINGS_H
 #define SKETCHERGUI_SKETCHERSETTINGS_H

-#include <Gui/PropertyPage.h>
 #include <memory>
+#include <Gui/PropertyPage.h>
+

 namespace SketcherGui {
 class Ui_SketcherSettings;
--- a/src/Mod/Sketcher/Gui/SoDatumLabel.cpp
+++ b/src/Mod/Sketcher/Gui/SoDatumLabel.cpp
@@ -21,7 +21,6 @@
 ***************************************************************************/

 #include "PreCompiled.h"
-
 #ifndef _PreComp_
 # ifdef FC_OS_WIN32
 # include <windows.h>
@@ -33,31 +32,27 @@
 # else
 # include <GL/gl.h>
 # endif
-# include <cfloat>
+
 # include <algorithm>
+# include <cfloat>
+# include <cmath>
 # include <QFontMetrics>
 # include <QPainter>
-# include <QPen>
+
 # include <Inventor/SoPrimitiveVertex.h>
 # include <Inventor/actions/SoGLRenderAction.h>
-# include <Inventor/misc/SoState.h>
-# include <cmath>
-# include <Inventor/actions/SoGetMatrixAction.h>
 # include <Inventor/elements/SoFocalDistanceElement.h>
-# include <Inventor/elements/SoFontNameElement.h>
-# include <Inventor/elements/SoFontSizeElement.h>
-# include <Inventor/elements/SoModelMatrixElement.h>
-# include <Inventor/elements/SoProjectionMatrixElement.h>
-# include <Inventor/elements/SoViewingMatrixElement.h>
-# include <Inventor/elements/SoViewVolumeElement.h>
 # include <Inventor/elements/SoViewportRegionElement.h>
+# include <Inventor/elements/SoViewVolumeElement.h>
+# include <Inventor/misc/SoState.h>
 #endif // _PreComp_

-
-#include "SoDatumLabel.h"
 #include <Gui/BitmapFactory.h>
 #include <Gui/Tools.h>

+#include "SoDatumLabel.h"
+
+
 #define ZCONSTR 0.006f

 using namespace SketcherGui;
--- a/src/Mod/Sketcher/Gui/SoDatumLabel.h
+++ b/src/Mod/Sketcher/Gui/SoDatumLabel.h
@@ -23,22 +23,21 @@
 #ifndef SKETCHERGUI_SODATUMLABEL_H
 #define SKETCHERGUI_SODATUMLABEL_H

-#include <Inventor/fields/SoSubField.h>
-#include <Inventor/nodes/SoSubNode.h>
-#include <Inventor/nodes/SoShape.h>
+#include <Inventor/SbBox3f.h>
 #include <Inventor/fields/SoSFColor.h>
 #include <Inventor/fields/SoSFEnum.h>
 #include <Inventor/fields/SoSFFloat.h>
-#include <Inventor/fields/SoSFBool.h>
-#include <Inventor/fields/SoSFName.h>
-#include <Inventor/fields/SoMFString.h>
-#include <Inventor/fields/SoSFInt32.h>
-#include <Inventor/fields/SoSFVec3f.h>
-#include <Inventor/fields/SoMFVec3f.h>
-#include <Inventor/SbBox3f.h>
 #include <Inventor/fields/SoSFImage.h>
+#include <Inventor/fields/SoSFInt32.h>
+#include <Inventor/fields/SoSFName.h>
+#include <Inventor/fields/SoSFVec3f.h>
+#include <Inventor/fields/SoMFString.h>
+#include <Inventor/fields/SoMFVec3f.h>
+#include <Inventor/nodes/SoShape.h>
+
 #include <Mod/Sketcher/SketcherGlobal.h>

+
 namespace SketcherGui {

 class SketcherGuiExport SoDatumLabel : public SoShape {
--- a/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
+++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.cpp
@@ -21,31 +21,21 @@
 ***************************************************************************/

 #include "PreCompiled.h"
-
 #ifndef _PreComp_
-# include <Inventor/actions/SoGLRenderAction.h>
-# include <Inventor/misc/SoState.h>
-# include <cmath>
 # include <cfloat>
+# include <cmath>
+
 # include <Inventor/actions/SoGetMatrixAction.h>
 # include <Inventor/actions/SoGLRenderAction.h>
 # include <Inventor/elements/SoModelMatrixElement.h>
-# include <Inventor/elements/SoProjectionMatrixElement.h>
-# include <Inventor/elements/SoViewingMatrixElement.h>
-# include <Inventor/elements/SoViewVolumeElement.h>
 # include <Inventor/elements/SoViewportRegionElement.h>
+# include <Inventor/elements/SoViewVolumeElement.h>
 # include <Inventor/nodes/SoCamera.h>
 #endif

-#include <Gui/Application.h>
-#include <Gui/Document.h>
-#include <Gui/MainWindow.h>
-#include <Gui/View3DInventor.h>
-#include <Gui/View3DInventorViewer.h>
-
-
 #include "SoZoomTranslation.h"

+
 // *************************************************************************

 using namespace SketcherGui;
--- a/src/Mod/Sketcher/Gui/SoZoomTranslation.h
+++ b/src/Mod/Sketcher/Gui/SoZoomTranslation.h
@@ -24,10 +24,10 @@
 #define SKETCHERGUI_SOZOOMTRANSLATION_H

 #include <Inventor/nodes/SoTranslation.h>
-#include <Inventor/nodes/SoSubNode.h>
-#include <Inventor/nodes/SoTransformation.h>
+
 #include <Mod/Sketcher/SketcherGlobal.h>

+
 namespace SketcherGui {

 class SketcherGuiExport SoZoomTranslation : public SoTranslation {