[Sketch] Gui: improve precompiled headers

2022-12-11 23:39:50 +01:00
parent ddd54e3165
commit 5e2fb4fb62
4 changed files with 52 additions and 51 deletions
--- a/src/Gui/InventorAll.h
+++ b/src/Gui/InventorAll.h
@@ -25,9 +25,9 @@

 // Open Inventor
 #ifdef FC_OS_MACOSX
-#include <OpenGL/gl.h>
+# include <OpenGL/gl.h>
 #else
-#include <GL/gl.h>
+# include <GL/gl.h>
 #endif

 #include <Inventor/C/basic.h>
@@ -36,11 +36,13 @@
 #include <Inventor/SbBox2f.h>
 #include <Inventor/SbClip.h>
 #include <Inventor/SbColor.h>
+#include <Inventor/SbImage.h>
 #include <Inventor/SbLine.h>
 #include <Inventor/SbLinear.h>
 #include <Inventor/SbRotation.h>
 #include <Inventor/SbSphere.h>
 #include <Inventor/SbTesselator.h>
+#include <Inventor/SbTime.h>
 #include <Inventor/SbVec2s.h>
 #include <Inventor/SbViewportRegion.h>
 #include <Inventor/SoDB.h>
@@ -52,6 +54,7 @@
 #include <Inventor/SoPickedPoint.h>
 #include <Inventor/SoPrimitiveVertex.h>
 #include <Inventor/SoRenderManager.h>
+
 #include <Inventor/actions/SoAction.h>
 #include <Inventor/actions/SoBoxHighlightRenderAction.h>
 #include <Inventor/actions/SoCallbackAction.h>
@@ -66,27 +69,34 @@
 #include <Inventor/actions/SoSearchAction.h>
 #include <Inventor/actions/SoToVRML2Action.h>
 #include <Inventor/actions/SoWriteAction.h>
+
 #include <Inventor/annex/ForeignFiles/SoSTLFileKit.h>
 #include <Inventor/annex/HardCopy/SoVectorizeAction.h>
 #include <Inventor/annex/HardCopy/SoVectorizePSAction.h>
 #include <Inventor/annex/HardCopy/SoVectorOutput.h>
+
 #include <Inventor/bundles/SoMaterialBundle.h>
 #include <Inventor/bundles/SoTextureCoordinateBundle.h>
+
 #include <Inventor/caches/SoNormalCache.h>
+
 #include <Inventor/details/SoDetail.h>
 #include <Inventor/details/SoFaceDetail.h>
 #include <Inventor/details/SoLineDetail.h>
 #include <Inventor/details/SoPointDetail.h>
+
 #include <Inventor/draggers/SoCenterballDragger.h>
 #include <Inventor/draggers/SoDragger.h>
 #include <Inventor/draggers/SoTrackballDragger.h>
 #include <Inventor/draggers/SoTransformerDragger.h>
+
 #include <Inventor/elements/SoCacheElement.h>
 #include <Inventor/elements/SoComplexityElement.h>
 #include <Inventor/elements/SoComplexityTypeElement.h>
 #include <Inventor/elements/SoCoordinateElement.h>
 #include <Inventor/elements/SoCreaseAngleElement.h>
 #include <Inventor/elements/SoDrawStyleElement.h>
+#include <Inventor/elements/SoFocalDistanceElement.h>
 #include <Inventor/elements/SoFontNameElement.h>
 #include <Inventor/elements/SoFontSizeElement.h>
 #include <Inventor/elements/SoGLCacheContextElement.h>
@@ -113,20 +123,24 @@
 #include <Inventor/elements/SoViewportRegionElement.h>
 #include <Inventor/elements/SoViewVolumeElement.h>
 #include <Inventor/elements/SoWindowElement.h>
+
 #include <Inventor/engines/SoCalculator.h>
 #include <Inventor/engines/SoComposeVec3f.h>
 #include <Inventor/engines/SoComposeRotationFromTo.h>
 #include <Inventor/engines/SoComposeRotation.h>
 #include <Inventor/engines/SoConcatenate.h>
+
 #include <Inventor/errors/SoDebugError.h>
 #include <Inventor/errors/SoError.h>
 #include <Inventor/errors/SoReadError.h>
+
 #include <Inventor/events/SoEvent.h>
 #include <Inventor/events/SoKeyboardEvent.h>
 #include <Inventor/events/SoLocation2Event.h>
 #include <Inventor/events/SoMotion3Event.h>
 #include <Inventor/events/SoMouseButtonEvent.h>
 #include <Inventor/events/SoSpaceballButtonEvent.h>
+
 #include <Inventor/fields/SoMFColor.h>
 #include <Inventor/fields/SoMFNode.h>
 #include <Inventor/fields/SoSFBool.h>
@@ -137,12 +151,16 @@
 #include <Inventor/fields/SoSFNode.h>
 #include <Inventor/fields/SoSFRotation.h>
 #include <Inventor/fields/SoSFVec3f.h>
+
 #include <Inventor/manips/SoCenterballManip.h>
 #include <Inventor/manips/SoClipPlaneManip.h>
+#include <Inventor/manips/SoTransformBoxManip.h>
 #include <Inventor/manips/SoTransformerManip.h>
+
 #include <Inventor/misc/SoChildList.h>
 #include <Inventor/misc/SoContextHandler.h>
 #include <Inventor/misc/SoState.h>
+
 #include <Inventor/nodes/SoAnnotation.h>
 #include <Inventor/nodes/SoAntiSquish.h>
 #include <Inventor/nodes/SoAsciiText.h>
@@ -169,6 +187,7 @@
 #include <Inventor/nodes/SoIndexedLineSet.h>
 #include <Inventor/nodes/SoIndexedPointSet.h>
 #include <Inventor/nodes/SoIndexedTriangleStripSet.h>
+#include <Inventor/nodes/SoInfo.h>
 #include <Inventor/nodes/SoLightModel.h>
 #include <Inventor/nodes/SoLineSet.h>
 #include <Inventor/nodes/SoLocateHighlight.h>
@@ -211,18 +230,24 @@
 #include <Inventor/nodes/SoTranslation.h>
 #include <Inventor/nodes/SoTransparencyType.h>
 #include <Inventor/nodes/SoVertexProperty.h>
+
 #include <Inventor/nodekits/SoShapeKit.h>
-#include <Inventor/manips/SoTransformBoxManip.h>
+
 #include <Inventor/projectors/SbLineProjector.h>
 #include <Inventor/projectors/SbPlaneProjector.h>
 #include <Inventor/projectors/SbSpherePlaneProjector.h>
 #include <Inventor/projectors/SbSphereSheetProjector.h>
+
 #include <Inventor/sensors/SoFieldSensor.h>
 #include <Inventor/sensors/SoIdleSensor.h>
 #include <Inventor/sensors/SoNodeSensor.h>
+#include <Inventor/sensors/SoSensor.h>
 #include <Inventor/sensors/SoTimerSensor.h>
+
 #include <Inventor/system/inttypes.h>
+
 #include <Inventor/threads/SbStorage.h>
+
 #include <Inventor/VRMLnodes/SoVRMLGroup.h>
 #include <Inventor/VRMLnodes/SoVRMLIndexedFaceSet.h>
 #include <Inventor/VRMLnodes/SoVRMLNormal.h>
--- a/src/Gui/QtAll.h
+++ b/src/Gui/QtAll.h
@@ -46,6 +46,7 @@
 #include <qrunnable.h>
 #include <QSet>
 #include <QSignalMapper>
+#include <QString>
 #include <QTemporaryFile>
 #include <qtextstream.h>
 #include <qthread.h>
@@ -89,6 +90,7 @@
 #include <QGraphicsSvgItem>
 #include <QGraphicsSceneContextMenuEvent>
 #include <QGroupBox>
+#include <QGuiApplication>
 #include <QHeaderView>
 #include <qimage.h>
 #include <QImageWriter>
--- a/src/Mod/Sketcher/Gui/PreCompiled.cpp
+++ b/src/Mod/Sketcher/Gui/PreCompiled.cpp
@@ -20,5 +20,4 @@
 *                                                                         *
 ***************************************************************************/

-
 #include "PreCompiled.h" 
--- a/src/Mod/Sketcher/Gui/PreCompiled.h
+++ b/src/Mod/Sketcher/Gui/PreCompiled.h
@@ -20,7 +20,6 @@
 *                                                                         *
 ***************************************************************************/

-
 #ifndef __PRECOMPILED_GUI__
 #define __PRECOMPILED_GUI__

@@ -33,41 +32,34 @@
 #ifdef _PreComp_

 // standard
-#include <iostream>
-#include <cassert>
+#include <cfloat>
 #include <cmath>
-
 #include <cstdlib>

 // STL
-#include <vector>
-#include <map>
-#include <string>
-#include <list>
-#include <set>
 #include <algorithm>
-#include <stack>
-#include <queue>
 #include <bitset>
+#include <functional>
+#include <map>
+#include <memory>
+#include <vector>

 // Boost
 #include <boost/math/special_functions/fpclassify.hpp>
-#include <boost/bind/bind.hpp>
-#include <boost/scoped_ptr.hpp>

 #ifdef FC_OS_WIN32
 # define NOMINMAX
 # include <windows.h>
 #endif

-// OCC
-#include <Standard_Version.hxx>
-#include <GC_MakeEllipse.hxx>
+// OpenCasCade
 #include <BRep_Tool.hxx>
+#include <GC_MakeEllipse.hxx>
 #include <gp_Pnt.hxx>
 #include <Precision.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
+#include <Standard_Version.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
@@ -75,44 +67,27 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>

-// Qt Toolkit
-#ifndef __QtAll__
-# include <Gui/QtAll.h>
-#endif
-
+// Qt
+# include <QApplication>
+# include <QDebug>
 # include <QGuiApplication>
+# include <QInputDialog>
+# include <QKeyEvent>
+# include <QMenu>
 # include <QMessageBox>
-#include <qdebug.h>
-#include <QString>
+# include <QPainter>
+# include <QPixmapCache>
+# include <QRegularExpression>
+# include <QScreen>
+# include <QShortcut>
+# include <QString>
+# include <QStyledItemDelegate>

 // all of Inventor
 #ifndef __InventorAll__
 # include <Gui/InventorAll.h>
 #endif

-#include <Inventor/SbImage.h>
-#include <Inventor/sensors/SoSensor.h>
-#include <Inventor/actions/SoGetMatrixAction.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/actions/SoGetMatrixAction.h>
-#include <Inventor/actions/SoGLRenderAction.h>
-#include <Inventor/elements/SoFocalDistanceElement.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/nodes/SoCamera.h>
-#include <Inventor/nodes/SoInfo.h>
-#include <Inventor/SbTime.h>
-
-
 #endif //_PreComp_

 #endif // __PRECOMPILED_GUI__