From 1e01f8c2234e4dfb4e98c293826eac4289555b00 Mon Sep 17 00:00:00 2001
From: jriegel <FreeCAD@juergen-riegel.net>
Date: Mon, 22 Dec 2014 16:30:58 +0100
Subject: [PATCH] fix errors from merge of master

---
 .../src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp           |  4 ++++
 src/Mod/PartDesign/Gui/TaskChamferParameters.ui       |  2 +-
 src/Mod/PartDesign/Gui/Workbench.cpp                  | 11 ++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp b/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp
index b22b28905..46a1dc7d2 100644
--- a/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp
+++ b/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp
@@ -157,6 +157,9 @@ Driver_Mesh::Status DriverSTL_R_SMDS_Mesh::Perform()
 
 // static methods
 
+#pragma warning(push)
+#pragma warning(disable : 4805)
+
 static Standard_Real readFloat(OSD_File& theFile)
 {
   union {
@@ -176,6 +179,7 @@ static Standard_Real readFloat(OSD_File& theFile)
 
   return u.f;
 }
+#pragma warning(pop)
 
 static SMDS_MeshNode* addNode(const gp_Pnt& P,
                               DriverSTL_DataMapOfPntNodePtr& uniqnodes,
diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.ui b/src/Mod/PartDesign/Gui/TaskChamferParameters.ui
index 9c958181f..29a603a8f 100644
--- a/src/Mod/PartDesign/Gui/TaskChamferParameters.ui
+++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.ui
@@ -42,7 +42,7 @@
     <widget class="QListWidget" name="listWidgetReferences"/>
    </item>
    <item>
-    <widget class="Gui::QuantitySpinBox" name="chamferDistance"/>
+      <widget class="Gui::QuantitySpinBox" name="chamferDistance"/>
    </item>
    <item>
     <widget class="QLabel" name="label">
diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp
index 7c054f8de..73cb88f1e 100644
--- a/src/Mod/PartDesign/Gui/Workbench.cpp
+++ b/src/Mod/PartDesign/Gui/Workbench.cpp
@@ -107,6 +107,7 @@ PartDesign::Body *Workbench::setUpPart(const App::Part *part)
 
 void Workbench::_doMigration(const App::Document* doc)
 {
+	bool groupCreated = false;
 
     if(doc->countObjects() != 0) {
          // show a warning about the convertion
@@ -165,7 +166,7 @@ void Workbench::_doMigration(const App::Document* doc)
     // Always create at least the first body, even if the document is empty
     // This adds both the base planes and the body
     Gui::Command::runCommand(Gui::Command::Doc, "FreeCADGui.runCommand('PartDesign_Body')");
-    activeBody = PartDesignGui::ActivePartObject;
+    PartDesign::Body *activeBody = PartDesignGui::ActivePartObject;
 
 
     // Create one Body for every root and put the appropriate features into it
@@ -391,17 +392,17 @@ void Workbench::_switchToDocument(const App::Document* doc)
 
 void Workbench::slotActiveDocument(const Gui::Document& Doc)
 {
-    switchToDocument(Doc.getDocument());
+    _switchToDocument(Doc.getDocument());
 }
 
 void Workbench::slotNewDocument(const App::Document& Doc)
 {
-    switchToDocument(&Doc);
+    _switchToDocument(&Doc);
 }
 
 void Workbench::slotFinishRestoreDocument(const App::Document& Doc)
 {    
-    switchToDocument(&Doc);
+    _switchToDocument(&Doc);
 }
 
 void Workbench::slotDeleteDocument(const App::Document&)
@@ -616,7 +617,7 @@ void Workbench::activated()
 
     // make the previously used active Body active again
     PartDesignGui::ActivePartObject = NULL;
-    switchToDocument(App::GetApplication().getActiveDocument());
+    _switchToDocument(App::GetApplication().getActiveDocument());
 
     addTaskWatcher(Watcher);
     Gui::Control().showTaskView();