From 2954d9a9600616b6b99c8ebbeab965bb30167c30 Mon Sep 17 00:00:00 2001
From: jrheinlaender <jrheinlaender@users.sourceforge.net>
Date: Mon, 22 Jul 2013 13:17:35 +0200
Subject: [PATCH] Port of WizardShaft to PySide

---
 src/Mod/PartDesign/WizardShaft/Shaft.py            | 2 +-
 src/Mod/PartDesign/WizardShaft/ShaftDiagram.py     | 2 +-
 src/Mod/PartDesign/WizardShaft/WizardShaft.py      | 5 +++--
 src/Mod/PartDesign/WizardShaft/WizardShaftTable.py | 8 ++++----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Mod/PartDesign/WizardShaft/Shaft.py b/src/Mod/PartDesign/WizardShaft/Shaft.py
index 01c2e3304..c3a2c5acc 100644
--- a/src/Mod/PartDesign/WizardShaft/Shaft.py
+++ b/src/Mod/PartDesign/WizardShaft/Shaft.py
@@ -172,7 +172,7 @@ class Shaft:
             row = rowEndEdgeType
             idx = 1
 
-        edgeType = self.tableWidget.item(row, column).text().toAscii()[0].upper()
+        edgeType = self.tableWidget.item(row, column).text()[0].upper()
         if not ((edgeType == "C") or (edgeType == "F")):
             return # neither chamfer nor fillet defined
 
diff --git a/src/Mod/PartDesign/WizardShaft/ShaftDiagram.py b/src/Mod/PartDesign/WizardShaft/ShaftDiagram.py
index d7cd539d5..e49a7caeb 100644
--- a/src/Mod/PartDesign/WizardShaft/ShaftDiagram.py
+++ b/src/Mod/PartDesign/WizardShaft/ShaftDiagram.py
@@ -20,7 +20,7 @@
 # *                                                                            *
 # ******************************************************************************/
 
-from PyQt4 import QtCore, QtGui
+from PySide import QtCore, QtGui
 import FreeCAD, FreeCADGui
 
 class Diagram:
diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.py b/src/Mod/PartDesign/WizardShaft/WizardShaft.py
index bfbc8eff4..5171ed985 100644
--- a/src/Mod/PartDesign/WizardShaft/WizardShaft.py
+++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.py
@@ -21,7 +21,7 @@
 # ******************************************************************************/
 
 import FreeCAD, FreeCADGui
-from PyQt4 import QtCore, QtGui
+from PySide import QtCore, QtGui
 from WizardShaftTable import WizardShaftTable
 from Shaft import Shaft
 
@@ -32,7 +32,8 @@ class TaskWizardShaft:
     
     def __init__(self, doc):
         mw = QtGui.qApp.activeWindow()
-        cw = mw.centralWidget() # This is a qmdiarea widget
+        #cw = mw.centralWidget() # This is a qmdiarea widget
+        cw = mw.findChild(QtGui.QMdiArea)
         self.doc = doc
 
         # Get active document or create a new one
diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py
index 45c021f2c..dda2bec86 100644
--- a/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py
+++ b/src/Mod/PartDesign/WizardShaft/WizardShaftTable.py
@@ -20,7 +20,7 @@
 # *                                                                            *
 # ******************************************************************************/
 
-from PyQt4 import QtCore, QtGui
+from PySide import QtCore, QtGui
 import FreeCAD # Just for debug printing...
 
 class WizardShaftTable:
@@ -88,7 +88,7 @@ class WizardShaftTable:
         self.setDiameter(1, 60.0)
         self.setConstraintType(1, "Force")
 
-    def slotInsertColumn(self, point):
+    def slotInsertColumn(self):
         # FIXME: Allow inserting columns, not just adding at the end
         # Note: need to re-name all the following column headers then
         # if (column == self.tableWidget.columnCount()):
@@ -248,7 +248,7 @@ class WizardShaftTable:
     def getInnerDiameter(self, column):
         return self.getDoubleValue("InnerDiameter", column)
 
-    @QtCore.pyqtSlot('QString')
+    @QtCore.Slot('QString')
     def slotConstraintType(self, text):
         self.shaft.updateConstraint(self.getFocusedColumn(), text)
 
@@ -312,7 +312,7 @@ class WizardShaftTable:
     def getListValue(self, row, column):
         widget = self.widget.cellWidget(self.rowDict[row], column)
         if widget is not None:
-            return widget.currentText().toAscii() #[0].upper()
+            return widget.currentText() #[0].upper()
         else:
             return None