From 244054ff1f8aea8630a6ce295bdc79dac05d3c56 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 30 Nov 2015 20:38:19 +0100 Subject: [PATCH] + reorder header to fix warnings with Win32 build --- src/Mod/Part/Gui/TaskShapeBuilder.cpp | 2 +- src/Mod/Part/Gui/ViewProviderConeParametric.cpp | 8 +------- src/Mod/Part/Gui/ViewProviderImport.cpp | 3 +-- src/Mod/Part/Gui/ViewProviderPrism.cpp | 2 +- src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp | 2 +- src/Mod/Part/Gui/ViewProviderTorusParametric.cpp | 10 ++-------- src/Mod/Points/Gui/AppPointsGui.cpp | 6 +++--- 7 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/Mod/Part/Gui/TaskShapeBuilder.cpp b/src/Mod/Part/Gui/TaskShapeBuilder.cpp index ec8022626..d8b406a6a 100644 --- a/src/Mod/Part/Gui/TaskShapeBuilder.cpp +++ b/src/Mod/Part/Gui/TaskShapeBuilder.cpp @@ -31,9 +31,9 @@ # include #endif +#include "ViewProviderExt.h" #include "ui_TaskShapeBuilder.h" #include "TaskShapeBuilder.h" -#include "ViewProviderExt.h" #include #include diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp index 171a34b01..70f05d50e 100644 --- a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp @@ -26,14 +26,8 @@ #ifndef _PreComp_ #endif -/// Here the FreeCAD includes sorted by Base,App,Gui...... -#include - #include "ViewProviderConeParametric.h" - - -//#include "Tree.h" - +#include using namespace PartGui; diff --git a/src/Mod/Part/Gui/ViewProviderImport.cpp b/src/Mod/Part/Gui/ViewProviderImport.cpp index a75d1f8f9..26345c231 100644 --- a/src/Mod/Part/Gui/ViewProviderImport.cpp +++ b/src/Mod/Part/Gui/ViewProviderImport.cpp @@ -26,6 +26,7 @@ #ifndef _PreComp_ #endif +#include "ViewProviderImport.h" #include /// Here the FreeCAD includes sorted by Base,App,Gui...... @@ -36,8 +37,6 @@ #include #include -#include "ViewProviderImport.h" - using namespace PartGui; diff --git a/src/Mod/Part/Gui/ViewProviderPrism.cpp b/src/Mod/Part/Gui/ViewProviderPrism.cpp index be783be6a..05c2bc48f 100644 --- a/src/Mod/Part/Gui/ViewProviderPrism.cpp +++ b/src/Mod/Part/Gui/ViewProviderPrism.cpp @@ -26,8 +26,8 @@ #ifndef _PreComp_ #endif -#include #include "ViewProviderPrism.h" +#include using namespace PartGui; using namespace std; diff --git a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp index bcc978196..a01e52819 100644 --- a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp +++ b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp @@ -26,8 +26,8 @@ #ifndef _PreComp_ #endif -#include #include "ViewProviderRegularPolygon.h" +#include using namespace PartGui; using namespace std; diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp index d74a755ba..c0c6edf7f 100644 --- a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp @@ -26,14 +26,8 @@ #ifndef _PreComp_ #endif -/// Here the FreeCAD includes sorted by Base,App,Gui...... -#include - #include "ViewProviderTorusParametric.h" - - -//#include "Tree.h" - +#include using namespace PartGui; @@ -45,7 +39,7 @@ using namespace std; PROPERTY_SOURCE(PartGui::ViewProviderTorusParametric, PartGui::ViewProviderPart) - + ViewProviderTorusParametric::ViewProviderTorusParametric() { sPixmap = "Tree_Part_Torus_Parametric.svg"; diff --git a/src/Mod/Points/Gui/AppPointsGui.cpp b/src/Mod/Points/Gui/AppPointsGui.cpp index 55aefaada..b54d6f26c 100644 --- a/src/Mod/Points/Gui/AppPointsGui.cpp +++ b/src/Mod/Points/Gui/AppPointsGui.cpp @@ -25,15 +25,15 @@ #ifndef _PreComp_ #endif +#include "ViewProvider.h" +#include "Workbench.h" + #include #include #include #include #include -#include "ViewProvider.h" -#include "Workbench.h" - // use a different name to CreateCommand() void CreatePointsCommands(void);