fix compiler warnings with py3 and msvc

2018-04-16 18:24:53 +02:00
parent 75c2f9ddbf
commit 5ff6945577
41 changed files with 35 additions and 20 deletions
--- a/src/Gui/PreCompiled.h
+++ b/src/Gui/PreCompiled.h
@@ -83,12 +83,12 @@
 #include <boost/filesystem/exception.hpp>


-#include "InventorAll.h"
-#include "Qt4All.h"
-
 // Python
 #include <Python.h>

+#include "InventorAll.h"
+#include "Qt4All.h"
+
 #elif defined(FC_OS_WIN32)
 #include <windows.h>
 #endif  //_PreComp_
--- a/src/Gui/ViewProviderDocumentObject.h
+++ b/src/Gui/ViewProviderDocumentObject.h
@@ -24,10 +24,9 @@
 #ifndef GUI_VIEWPROVIDER_DOCUMENTOBJECT_H
 #define GUI_VIEWPROVIDER_DOCUMENTOBJECT_H

-#include <Inventor/SoType.h>
-
 #include "ViewProvider.h"
 #include <App/DocumentObject.h>
+#include <Inventor/SoType.h>

 class SoMaterial;
 class SoDrawStyle;
--- a/src/Gui/ViewProviderGeometryObject.h
+++ b/src/Gui/ViewProviderGeometryObject.h
@@ -24,8 +24,8 @@
 #ifndef GUI_VIEWPROVIDER_GEOMETRYOBJECT_H
 #define GUI_VIEWPROVIDER_GEOMETRYOBJECT_H

-#include <Inventor/lists/SoPickedPointList.h> 
 #include "ViewProviderDragger.h"
+#include <Inventor/lists/SoPickedPointList.h>

 class SoPickedPointList;
 class SoSwitch;
--- a/src/Mod/Part/Gui/AppPartGui.cpp
+++ b/src/Mod/Part/Gui/AppPartGui.cpp
@@ -13,6 +13,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Python.h>
 # include <Inventor/system/inttypes.h>
 #endif

--- a/src/Mod/Part/Gui/Command.cpp
+++ b/src/Mod/Part/Gui/Command.cpp
@@ -24,6 +24,7 @@
 #include "PreCompiled.h"
 #ifndef _PreComp_
 # include <sstream>
+# include <Python.h>
 # include <QString>
 # include <QDir>
 # include <QFileInfo>
@@ -611,7 +612,7 @@ void CmdPartCompJoinFeatures::languageChange()

    Gui::ActionGroup* pcAction = qobject_cast<Gui::ActionGroup*>(_pcAction);
    QList<QAction*> a = pcAction->actions();
-
+
    Gui::Command* joinConnect = rcCmdMgr.getCommandByName("Part_JoinConnect");
    if (joinConnect) {
        QAction* cmd0 = a[0];
@@ -635,7 +636,7 @@ void CmdPartCompJoinFeatures::languageChange()
        cmd2->setToolTip(QApplication::translate("Part_JoinFeatures", joinCutout->getToolTipText()));
        cmd2->setStatusTip(QApplication::translate("Part_JoinFeatures", joinCutout->getStatusTip()));
    }
-#endif
+#endif
 }

 bool CmdPartCompJoinFeatures::isActive(void)
--- a/src/Mod/Part/Gui/CrossSections.cpp
+++ b/src/Mod/Part/Gui/CrossSections.cpp
@@ -36,6 +36,7 @@
 # include <QFutureWatcher>
 # include <QtConcurrentMap>
 # include <boost/bind.hpp>
+# include <Python.h>
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoDrawStyle.h>
--- a/src/Mod/Part/Gui/DlgExtrusion.cpp
+++ b/src/Mod/Part/Gui/DlgExtrusion.cpp
@@ -35,6 +35,7 @@
 # include <ShapeExtend_Explorer.hxx>
 # include <TopTools_HSequenceOfShape.hxx>
 # include <QMessageBox>
+# include <Python.h>
 # include <Inventor/system/inttypes.h>
 #endif

--- a/src/Mod/Part/Gui/DlgFilletEdges.cpp
+++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp
@@ -45,6 +45,7 @@
 # include <QTimer>
 # include <boost/signal.hpp>
 # include <boost/bind.hpp>
+# include <Python.h>
 # include <Inventor/actions/SoSearchAction.h>
 # include <Inventor/details/SoLineDetail.h>
 #endif
--- a/src/Mod/Part/Gui/DlgPrimitives.cpp
+++ b/src/Mod/Part/Gui/DlgPrimitives.cpp
@@ -30,6 +30,7 @@
 #include <GC_MakeArcOfCircle.hxx>
 #include <Geom_Circle.hxx>
 #include <Geom_TrimmedCurve.hxx>
+#include <Python.h>
 #include <Inventor/SoPickedPoint.h>
 #include <Inventor/events/SoMouseButtonEvent.h>
 #endif
--- a/src/Mod/Part/Gui/DlgRevolution.cpp
+++ b/src/Mod/Part/Gui/DlgRevolution.cpp
@@ -34,6 +34,7 @@
 # include <TopoDS_Edge.hxx>
 # include <ShapeExtend_Explorer.hxx>
 # include <TopTools_HSequenceOfShape.hxx>
+# include <Python.h>
 # include <Inventor/system/inttypes.h>
 # include <Precision.hxx>
 #endif
--- a/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp
+++ b/src/Mod/Part/Gui/DlgSettings3DViewPartImp.cpp
@@ -23,6 +23,7 @@

 #include "PreCompiled.h"

+#include <Python.h>
 #include <QMessageBox>
 #include "ViewProvider.h"
 #include "DlgSettings3DViewPartImp.h"
--- a/src/Mod/Part/Gui/Mirroring.cpp
+++ b/src/Mod/Part/Gui/Mirroring.cpp
@@ -30,6 +30,7 @@
 # include <TopExp_Explorer.hxx>
 # include <boost/bind.hpp>
 # include <cfloat>
+# include <Python.h>
 # include <Inventor/system/inttypes.h>
 #endif

--- a/src/Mod/Part/Gui/SoBrepEdgeSet.cpp
+++ b/src/Mod/Part/Gui/SoBrepEdgeSet.cpp
@@ -34,6 +34,7 @@
 # endif
 # include <float.h>
 # include <algorithm>
+# include <Python.h>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/SoPrimitiveVertex.h>
 # include <Inventor/actions/SoCallbackAction.h>
--- a/src/Mod/Part/Gui/SoBrepFaceSet.cpp
+++ b/src/Mod/Part/Gui/SoBrepFaceSet.cpp
@@ -30,6 +30,7 @@
 #include <float.h>
 #include <algorithm>
 #include <map>
+#include <Python.h>
 #include <Inventor/SoPickedPoint.h>
 #include <Inventor/SoPrimitiveVertex.h>
 #include <Inventor/actions/SoCallbackAction.h>
--- a/src/Mod/Part/Gui/SoBrepPointSet.cpp
+++ b/src/Mod/Part/Gui/SoBrepPointSet.cpp
@@ -34,6 +34,7 @@
 # endif
 # include <float.h>
 # include <algorithm>
+# include <Python.h>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/SoPrimitiveVertex.h>
 # include <Inventor/actions/SoCallbackAction.h>
--- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp
+++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp
@@ -27,6 +27,7 @@
 # include <QTextEdit>
 # include <QTextStream>
 # include <QTreeWidget>
+# include <Python.h>
 #endif

 #include <Standard_Version.hxx>
--- a/src/Mod/Part/Gui/TaskDimension.cpp
+++ b/src/Mod/Part/Gui/TaskDimension.cpp
@@ -29,6 +29,7 @@


 #include <sstream>
+#include <Python.h>

 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Vertex.hxx>
--- a/src/Mod/Part/Gui/TaskFaceColors.cpp
+++ b/src/Mod/Part/Gui/TaskFaceColors.cpp
@@ -34,6 +34,7 @@
 # include <TopTools_IndexedMapOfShape.hxx>
 # include <QMessageBox>
 # include <QSet>
+# include <Python.h>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/actions/SoRayPickAction.h>
 # include <Inventor/actions/SoSearchAction.h>
--- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp
+++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp
@@ -25,6 +25,7 @@

 #ifndef _PreComp_
 # include <Standard_math.hxx>
+# include <Python.h>
 # include <Inventor/nodes/SoBaseColor.h>
 # include <Inventor/nodes/SoDepthBuffer.h>
 # include <Inventor/nodes/SoDrawStyle.h>
--- a/src/Mod/Part/Gui/ViewProviderBox.cpp
+++ b/src/Mod/Part/Gui/ViewProviderBox.cpp
@@ -27,7 +27,6 @@
 #endif

 #include "ViewProviderBox.h"
-#include <Base/Parameter.h>


 using namespace PartGui;
--- a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp
@@ -27,7 +27,6 @@
 #endif

 #include "ViewProviderCircleParametric.h"
-#include <Base/Parameter.h>


 using namespace PartGui;
--- a/src/Mod/Part/Gui/ViewProviderCompound.cpp
+++ b/src/Mod/Part/Gui/ViewProviderCompound.cpp
@@ -28,9 +28,9 @@
 # include <TopTools_IndexedMapOfShape.hxx>
 #endif

-#include "ViewProviderCompound.h"
 #include <Gui/Application.h>
 #include <Mod/Part/App/FeatureCompound.h>
+#include "ViewProviderCompound.h"


 using namespace PartGui;
--- a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp
@@ -27,7 +27,6 @@
 #endif

 #include "ViewProviderConeParametric.h"
-#include <Base/Parameter.h>


 using namespace PartGui;
--- a/src/Mod/Part/Gui/ViewProviderCurveNet.cpp
+++ b/src/Mod/Part/Gui/ViewProviderCurveNet.cpp
@@ -29,6 +29,7 @@
 # include <TColgp_Array1OfPnt.hxx>
 # include <TopoDS.hxx>
 # include <TopExp_Explorer.hxx>
+# include <Python.h>
 # include <Inventor/nodes/SoComplexity.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoDrawStyle.h>
--- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp
@@ -27,7 +27,6 @@
 #endif

 #include "ViewProviderCylinderParametric.h"
-#include <Base/Parameter.h>


 using namespace PartGui;
--- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp
@@ -27,7 +27,6 @@
 #endif

 #include "ViewProviderEllipseParametric.h"
-#include <Base/Parameter.h>


 using namespace PartGui;
--- a/src/Mod/Part/Gui/ViewProviderExt.cpp
+++ b/src/Mod/Part/Gui/ViewProviderExt.cpp
@@ -68,7 +68,7 @@
 # include <TShort_Array1OfShortReal.hxx>
 # include <TShort_HArray1OfShortReal.hxx>
 # include <Precision.hxx>
-
+# include <Python.h>
 # include <Inventor/SoPickedPoint.h>
 # include <Inventor/details/SoFaceDetail.h>
 # include <Inventor/details/SoLineDetail.h>
--- a/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp
@@ -24,6 +24,7 @@
 #include "PreCompiled.h"

 #ifndef _PreComp_
+# include <Python.h>
 #endif

 #include "ViewProviderHelixParametric.h"
--- a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp
@@ -27,7 +27,6 @@
 #endif

 #include "ViewProviderLineParametric.h"
-#include <Base/Parameter.h>


 using namespace PartGui;
--- a/src/Mod/Part/Gui/ViewProviderMirror.cpp
+++ b/src/Mod/Part/Gui/ViewProviderMirror.cpp
@@ -27,6 +27,7 @@
 # include <QAction>
 # include <QMenu>
 # include <QTimer>
+# include <Python.h>
 # include <Standard_math.hxx>
 # include <TopExp.hxx>
 # include <TopTools_IndexedMapOfShape.hxx>
--- a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp
@@ -27,7 +27,6 @@
 #endif

 #include "ViewProviderPointParametric.h"
-#include <Base/Parameter.h>


 using namespace PartGui;
--- a/src/Mod/Part/Gui/ViewProviderPrism.cpp
+++ b/src/Mod/Part/Gui/ViewProviderPrism.cpp
@@ -27,7 +27,6 @@
 #endif

 #include "ViewProviderPrism.h"
-#include <Base/Parameter.h>

 using namespace PartGui;
 using namespace std;
--- a/src/Mod/Part/Gui/ViewProviderPython.cpp
+++ b/src/Mod/Part/Gui/ViewProviderPython.cpp
@@ -25,6 +25,7 @@

 #include <Standard_math.hxx>
 #ifndef _PreComp_
+# include <Python.h>
 # include <Inventor/nodes/SoSeparator.h>
 #endif
 #include <Gui/ViewProviderBuilder.h>
--- a/src/Mod/Part/Gui/ViewProviderReference.cpp
+++ b/src/Mod/Part/Gui/ViewProviderReference.cpp
@@ -24,6 +24,7 @@
 #include "PreCompiled.h"

 #ifndef _PreComp_
+# include <Python.h>
 # include <Poly_Polygon3D.hxx>
 # include <BRepBndLib.hxx>
 # include <BRepMesh_IncrementalMesh.hxx>
--- a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp
+++ b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp
@@ -27,7 +27,6 @@
 #endif

 #include "ViewProviderRegularPolygon.h"
-#include <Base/Parameter.h>

 using namespace PartGui;
 using namespace std;
--- a/src/Mod/Part/Gui/ViewProviderSpline.cpp
+++ b/src/Mod/Part/Gui/ViewProviderSpline.cpp
@@ -39,6 +39,7 @@
 # include <TopoDS_Shape.hxx>
 # include <TopoDS_Shell.hxx>
 # include <TopExp_Explorer.hxx>
+# include <Python.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoSwitch.h>
--- a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp
@@ -27,7 +27,6 @@
 #endif

 #include "ViewProviderTorusParametric.h"
-#include <Base/Parameter.h>


 using namespace PartGui;
--- a/src/Mod/Path/Gui/ViewProviderPath.cpp
+++ b/src/Mod/Path/Gui/ViewProviderPath.cpp
@@ -24,6 +24,7 @@
 #include "PreCompiled.h"

 #ifndef _PreComp_
+# include <Python.h>
 # include <Inventor/SbVec3f.h>
 # include <Inventor/nodes/SoSeparator.h>
 # include <Inventor/nodes/SoTransform.h>
--- a/src/Mod/Points/Gui/Command.cpp
+++ b/src/Mod/Points/Gui/Command.cpp
@@ -26,6 +26,7 @@
 # include <algorithm>
 # include <QFileInfo>
 # include <QInputDialog>
+# include <Python.h>
 # include <Inventor/events/SoMouseButtonEvent.h>
 #endif

--- a/src/Mod/Points/Gui/ViewProvider.cpp
+++ b/src/Mod/Points/Gui/ViewProvider.cpp
@@ -24,6 +24,7 @@
 #include "PreCompiled.h"

 #ifndef _PreComp_
+# include <Python.h>
 # include <Inventor/nodes/SoCamera.h>
 # include <Inventor/nodes/SoCoordinate3.h>
 # include <Inventor/nodes/SoDrawStyle.h>
--- a/src/Mod/Surface/Gui/Command.cpp
+++ b/src/Mod/Surface/Gui/Command.cpp
@@ -39,6 +39,7 @@
 #include <Geom_BSplineCurve.hxx>
 #include <TopExp_Explorer.hxx>
 #include <TopoDS.hxx>
+#include <Python.h>
 #include <Inventor/events/SoMouseButtonEvent.h>
 #endif