+ fix warnings with Win32 build

This commit is contained in:
wmayer
2015-12-01 00:51:57 +01:00
parent f46371b6ac
commit 93a3dc0cdd
27 changed files with 63 additions and 74 deletions

View File

@@ -37,9 +37,6 @@
#pragma warning( disable : 4786 ) // specifier longer then 255 chars
#endif
// Python
#include <Python.h>
// standard
#include <stdio.h>
#include <assert.h>
@@ -88,6 +85,9 @@
#include "InventorAll.h"
#include "Qt4All.h"
// Python
#include <Python.h>
#elif defined(FC_OS_WIN32)
#include <windows.h>

View File

@@ -27,6 +27,10 @@
# include <config.h>
#endif // HAVE_CONFIG_H
#ifdef _MSC_VER
# pragma warning(disable : 4005)
#endif
#include <QApplication>
#include <QIcon>
#include <QThread>

View File

@@ -38,6 +38,9 @@
# define DrawingGuiExport
#endif
#ifdef _MSC_VER
# pragma warning(disable : 4005)
#endif
#ifdef _PreComp_

View File

@@ -38,6 +38,7 @@
#endif
#ifdef _MSC_VER
# pragma warning(disable : 4005)
# pragma warning(disable : 4290)
#endif

View File

@@ -38,9 +38,10 @@
// here get the warnings of too long specifiers disabled (needed for VC6)
#ifdef _MSC_VER
# pragma warning( disable : 4251 )
# pragma warning( disable : 4503 )
# pragma warning( disable : 4786 ) // specifier longer then 255 chars
# pragma warning(disable : 4005)
# pragma warning(disable : 4251)
# pragma warning(disable : 4503)
# pragma warning(disable : 4786) // specifier longer then 255 chars
#endif
#ifdef _PreComp_

View File

@@ -42,9 +42,10 @@
// here get the warnings of too long specifiers disabled (needed for VC6)
#ifdef _MSC_VER
# pragma warning( disable : 4251 )
# pragma warning( disable : 4503 )
# pragma warning( disable : 4786 ) // specifier longer then 255 chars
# pragma warning(disable : 4005)
# pragma warning(disable : 4251)
# pragma warning(disable : 4503)
# pragma warning(disable : 4786) // specifier longer then 255 chars
#endif
#ifdef _PreComp_

View File

@@ -43,6 +43,10 @@
# define NOMINMAX
#endif
#ifdef _MSC_VER
# pragma warning(disable : 4005)
#endif
#ifdef _PreComp_
// standard

View File

@@ -37,6 +37,7 @@
// here get the warnings of too long specifiers disabled (needed for VC6)
#ifdef _MSC_VER
# pragma warning( disable : 4005 )
# pragma warning( disable : 4251 )
# pragma warning( disable : 4503 )
# pragma warning( disable : 4275 )

View File

@@ -13,6 +13,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Standard_math.hxx>
# include <Inventor/system/inttypes.h>
#endif
#include <Base/Console.h>

View File

@@ -31,6 +31,7 @@
# include <TopoDS_Face.hxx>
# include <TopExp_Explorer.hxx>
# include <QMessageBox>
# include <Inventor/system/inttypes.h>
#endif
#include "ui_DlgExtrusion.h"

View File

@@ -31,6 +31,7 @@
# include <TopExp_Explorer.hxx>
# include <TopoDS.hxx>
# include <TopoDS_Edge.hxx>
# include <Inventor/system/inttypes.h>
#endif
#include "ui_DlgRevolution.h"

View File

@@ -24,10 +24,10 @@
#include "PreCompiled.h"
#include <QMessageBox>
#include "ViewProvider.h"
#include "DlgSettings3DViewPartImp.h"
#include "ui_DlgSettings3DViewPart.h"
#include "ViewProvider.h"
#include <Gui/PrefWidgets.h>
#include <Gui/Application.h>
#include <Gui/Document.h>

View File

@@ -30,6 +30,7 @@
# include <TopExp_Explorer.hxx>
# include <boost/bind.hpp>
# include <cfloat>
# include <Inventor/system/inttypes.h>
#endif
#include "Mirroring.h"

View File

@@ -44,10 +44,6 @@
#include <Mod/Part/App/PartFeature.h>
//#include "Tree.h"
using namespace PartGui;
using namespace std;

View File

@@ -26,14 +26,8 @@
#ifndef _PreComp_
#endif
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <Base/Parameter.h>
#include "ViewProviderBox.h"
//#include "Tree.h"
#include <Base/Parameter.h>
using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
PROPERTY_SOURCE(PartGui::ViewProviderBox, PartGui::ViewProviderPart)
ViewProviderBox::ViewProviderBox()
{
sPixmap = "Tree_Part_Box_Parametric.svg";

View File

@@ -26,14 +26,8 @@
#ifndef _PreComp_
#endif
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <Base/Parameter.h>
#include "ViewProviderCircleParametric.h"
//#include "Tree.h"
#include <Base/Parameter.h>
using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
PROPERTY_SOURCE(PartGui::ViewProviderCircleParametric, PartGui::ViewProviderPart)
ViewProviderCircleParametric::ViewProviderCircleParametric()
{
sPixmap = "Part_Circle_Parametric.svg";

View File

@@ -26,14 +26,8 @@
#ifndef _PreComp_
#endif
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <Base/Parameter.h>
#include "ViewProviderCylinderParametric.h"
//#include "Tree.h"
#include <Base/Parameter.h>
using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
PROPERTY_SOURCE(PartGui::ViewProviderCylinderParametric, PartGui::ViewProviderPart)
ViewProviderCylinderParametric::ViewProviderCylinderParametric()
{
sPixmap = "Tree_Part_Cylinder_Parametric.svg";

View File

@@ -26,14 +26,8 @@
#ifndef _PreComp_
#endif
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <Base/Parameter.h>
#include "ViewProviderEllipseParametric.h"
//#include "Tree.h"
#include <Base/Parameter.h>
using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
PROPERTY_SOURCE(PartGui::ViewProviderEllipseParametric, PartGui::ViewProviderPart)
ViewProviderEllipseParametric::ViewProviderEllipseParametric()
{
sPixmap = "Part_Ellipse_Parametric.svg";

View File

@@ -26,14 +26,8 @@
#ifndef _PreComp_
#endif
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <Base/Parameter.h>
#include "ViewProviderLineParametric.h"
//#include "Tree.h"
#include <Base/Parameter.h>
using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
PROPERTY_SOURCE(PartGui::ViewProviderLineParametric, PartGui::ViewProviderPart)
ViewProviderLineParametric::ViewProviderLineParametric()
{
sPixmap = "Part_Line_Parametric.svg";

View File

@@ -26,9 +26,9 @@
#ifndef _PreComp_
#endif
#include "ViewProviderPlaneParametric.h"
#include <Mod/Part/App/FeatureFace.h>
#include <Mod/Part/App/Part2DObject.h>
#include "ViewProviderPlaneParametric.h"
using namespace PartGui;

View File

@@ -26,14 +26,8 @@
#ifndef _PreComp_
#endif
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <Base/Parameter.h>
#include "ViewProviderPointParametric.h"
//#include "Tree.h"
#include <Base/Parameter.h>
using namespace PartGui;
@@ -45,7 +39,7 @@ using namespace std;
PROPERTY_SOURCE(PartGui::ViewProviderPointParametric, PartGui::ViewProviderPart)
ViewProviderPointParametric::ViewProviderPointParametric()
{
sPixmap = "Part_Point_Parametric.svg";

View File

@@ -26,17 +26,11 @@
#ifndef _PreComp_
#endif
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <Base/Parameter.h>
#include "ViewProviderRuledSurface.h"
#include <Mod/Part/App/PartFeatures.h>
#include <Gui/Application.h>
//#include "Tree.h"
#include <Base/Parameter.h>
using namespace PartGui;
@@ -48,7 +42,7 @@ using namespace std;
PROPERTY_SOURCE(PartGui::ViewProviderRuledSurface, PartGui::ViewProviderPart)
ViewProviderRuledSurface::ViewProviderRuledSurface()
{
sPixmap = "Part_RuledSurface.svg";

View File

@@ -44,6 +44,10 @@
#endif
#ifdef _MSC_VER
# pragma warning(disable : 4005)
#endif
#ifdef _PreComp_
// Python

View File

@@ -37,6 +37,9 @@
# define AppRaytracingGuiExport
#endif
#ifdef _MSC_VER
# pragma warning(disable : 4005)
#endif
#ifdef _PreComp_

View File

@@ -41,6 +41,10 @@
#include <Standard_math.hxx>
#ifdef _MSC_VER
# pragma warning(disable : 4005)
#endif
#ifdef _PreComp_
// Python

View File

@@ -41,6 +41,10 @@
#endif
#ifdef _MSC_VER
# pragma warning(disable : 4005)
#endif
#ifdef _PreComp_
// standard

View File

@@ -39,9 +39,10 @@
// here get the warnings of too long specifiers disabled (needed for VC6)
#ifdef _MSC_VER
# pragma warning( disable : 4251 )
# pragma warning( disable : 4503 )
# pragma warning( disable : 4786 ) // specifier longer then 255 chars
# pragma warning(disable : 4005)
# pragma warning(disable : 4251)
# pragma warning(disable : 4503)
# pragma warning(disable : 4786) // specifier longer then 255 chars
#endif
#ifdef _PreComp_