[Gui] Inventor: remove unused includes

-also move some includes to precompiled header
2022-03-06 03:28:50 +01:00
parent f274c63e0e
commit 07c28ad22a
8 changed files with 47 additions and 53 deletions
--- a/src/Gui/Inventor/MarkerBitmaps.h
+++ b/src/Gui/Inventor/MarkerBitmaps.h
@@ -20,13 +20,13 @@
 *                                                                         *
 ***************************************************************************/

-
 #ifndef GUI_INVENTOR_MARKERBITMAPS_H
 #define GUI_INVENTOR_MARKERBITMAPS_H

-#include <string>
 #include <list>
 #include <map>
+#include <string>
+

 namespace Gui { namespace Inventor {

--- a/src/Gui/Inventor/SmSwitchboard.cpp
+++ b/src/Gui/Inventor/SmSwitchboard.cpp
@@ -44,22 +44,20 @@
 // FIXME: implement proper writing / WriteAction handling  2002-02-07 larsa

 #include "PreCompiled.h"
+
+#ifndef _PreComp_
+# include <Inventor/actions/SoCallbackAction.h>
+# include <Inventor/actions/SoGetBoundingBoxAction.h>
+# include <Inventor/actions/SoGetMatrixAction.h>
+# include <Inventor/actions/SoGLRenderAction.h>
+# include <Inventor/actions/SoHandleEventAction.h>
+# include <Inventor/actions/SoPickAction.h>
+# include <Inventor/actions/SoSearchAction.h>
+# include <Inventor/misc/SoChildList.h>
+#endif
+
 #include "SmSwitchboard.h"
-#include <Inventor/nodes/SoSubNode.h>
-#include <Inventor/misc/SoChildList.h>

-#include <Inventor/actions/SoGetBoundingBoxAction.h>
-#include <Inventor/actions/SoSearchAction.h>
-#include <Inventor/actions/SoGetMatrixAction.h>
-#include <Inventor/actions/SoGLRenderAction.h>
-#include <Inventor/actions/SoPickAction.h>
-#include <Inventor/actions/SoHandleEventAction.h>
-#include <Inventor/actions/SoCallbackAction.h>
-#include <Inventor/actions/SoGetPrimitiveCountAction.h>
-#include <Inventor/actions/SoWriteAction.h>
-#include <Inventor/SoOutput.h>
-
-#include <Inventor/errors/SoDebugError.h>

 /*!
  \var SoMFBool SmSwitchboard::enable
--- a/src/Gui/Inventor/SmSwitchboard.h
+++ b/src/Gui/Inventor/SmSwitchboard.h
@@ -33,11 +33,8 @@
 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \**************************************************************************/

-#include <Inventor/nodes/SoGroup.h>
 #include <Inventor/fields/SoMFBool.h>
-#include <Inventor/nodes/SoSubNode.h>
-
-//#include <SmallChange/basic.h>
+#include <Inventor/nodes/SoGroup.h>


 class GuiExport SmSwitchboard : public SoGroup {
--- a/src/Gui/Inventor/SoAutoZoomTranslation.cpp
+++ b/src/Gui/Inventor/SoAutoZoomTranslation.cpp
@@ -23,25 +23,16 @@
 #include "PreCompiled.h"

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

-#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/nodes/SoCamera.h>
-
-
 #include "SoAutoZoomTranslation.h"

-// *************************************************************************

 using namespace Gui;

--- a/src/Gui/Inventor/SoAutoZoomTranslation.h
+++ b/src/Gui/Inventor/SoAutoZoomTranslation.h
@@ -23,10 +23,9 @@
 #ifndef GUI_SOAUTOZOOMTRANSLATION_H
 #define GUI_SOAUTOZOOMTRANSLATION_H

-#include <Inventor/nodes/SoTranslation.h>
-#include <Inventor/nodes/SoSubNode.h>
 #include <Inventor/nodes/SoTransformation.h>

+
 namespace Gui {

 class GuiExport SoAutoZoomTranslation : public SoTransformation  {
@@ -37,7 +36,6 @@ class GuiExport SoAutoZoomTranslation : public SoTransformation  {
 public:
    static void initClass();
    SoAutoZoomTranslation();
-    //SoSFVec3f abPos;

    SoSFFloat scaleFactor;

@@ -53,7 +51,7 @@ protected:
    float getScaleFactor(SoAction*) const;

 private:
-    //void setAutoScale(void);
+
 };

 }
--- a/src/Gui/Inventor/SoDrawingGrid.cpp
+++ b/src/Gui/Inventor/SoDrawingGrid.cpp
@@ -21,22 +21,26 @@
 ***************************************************************************/

 #include "PreCompiled.h"
+
+#ifndef _PreComp_
+# include <QObject>
+# include <Inventor/actions/SoGLRenderAction.h>
+# include <Inventor/elements/SoCacheElement.h>
+# include <Inventor/elements/SoLazyElement.h>
+# include <Inventor/elements/SoModelMatrixElement.h>
+# include <Inventor/elements/SoProjectionMatrixElement.h>
+# include <Inventor/elements/SoViewingMatrixElement.h>
+# include <Inventor/elements/SoViewportRegionElement.h>
+#endif
+
 #ifdef FC_OS_MACOSX
 #include <OpenGL/gl.h>
 #else
 #include <GL/gl.h>
 #endif
-#include <Inventor/actions/SoGLRenderAction.h>
-#include <Inventor/elements/SoCacheElement.h>
-#include <Inventor/elements/SoLazyElement.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 "SoDrawingGrid.h"
-#include <QObject>
+

 using namespace Gui::Inventor;

--- a/src/Gui/Inventor/SoDrawingGrid.h
+++ b/src/Gui/Inventor/SoDrawingGrid.h
@@ -19,14 +19,14 @@
 *   Suite 330, Boston, MA  02111-1307, USA                                *
 *                                                                         *
 ***************************************************************************/
-
-
+
 #ifndef GUI_INVENTOR_SODRAWINGGRID_H
 #define GUI_INVENTOR_SODRAWINGGRID_H

-#include <Inventor/nodes/SoSubNode.h>
+//#include <Inventor/nodes/SoSubNode.h>
 #include <Inventor/nodes/SoShape.h>

+
 namespace Gui { namespace Inventor {

 class GuiExport SoDrawingGrid : public SoShape {
--- a/src/Gui/InventorAll.h
+++ b/src/Gui/InventorAll.h
@@ -46,12 +46,14 @@
 #include <Inventor/SbViewportRegion.h>
 #include <Inventor/SoEventManager.h>
 #include <Inventor/actions/SoBoxHighlightRenderAction.h>
+#include <Inventor/actions/SoCallbackAction.h>
 #include <Inventor/actions/SoGetBoundingBoxAction.h>
 #include <Inventor/actions/SoGetMatrixAction.h>
 #include <Inventor/actions/SoGetPrimitiveCountAction.h>
 #include <Inventor/actions/SoGLRenderAction.h>
 #include <Inventor/actions/SoHandleEventAction.h>
 #include <Inventor/actions/SoLineHighlightRenderAction.h>
+#include <Inventor/actions/SoPickAction.h>
 #include <Inventor/actions/SoRayPickAction.h>
 #include <Inventor/actions/SoSearchAction.h>
 #include <Inventor/actions/SoToVRML2Action.h>
@@ -68,18 +70,22 @@
 #include <Inventor/draggers/SoTransformerDragger.h>
 #include <Inventor/draggers/SoTrackballDragger.h>
 #include <Inventor/draggers/SoCenterballDragger.h>
+#include <Inventor/elements/SoCacheElement.h>
 #include <Inventor/elements/SoCoordinateElement.h>
 #include <Inventor/elements/SoCreaseAngleElement.h>
 #include <Inventor/elements/SoGLCacheContextElement.h>
 #include <Inventor/elements/SoGLCoordinateElement.h>
+#include <Inventor/elements/SoLazyElement.h>
+#include <Inventor/elements/SoModelMatrixElement.h>
 #include <Inventor/elements/SoNormalBindingElement.h>
 #include <Inventor/elements/SoNormalElement.h>
+#include <Inventor/elements/SoProjectionMatrixElement.h>
 #include <Inventor/elements/SoReplacedElement.h>
+#include <Inventor/elements/SoShapeStyleElement.h>
+#include <Inventor/elements/SoTextureEnabledElement.h>
+#include <Inventor/elements/SoViewingMatrixElement.h>
 #include <Inventor/elements/SoViewportRegionElement.h>
 #include <Inventor/elements/SoViewVolumeElement.h>
-#include <Inventor/elements/SoModelMatrixElement.h>
-#include <Inventor/elements/SoTextureEnabledElement.h>
-#include <Inventor/elements/SoShapeStyleElement.h>
 #include <Inventor/engines/SoComposeVec3f.h>
 #include <Inventor/engines/SoComposeRotationFromTo.h>
 #include <Inventor/engines/SoComposeRotation.h>