Re #7950. More changes for PyQt API change.

This is exactly the same change in several places. Previously the
toPyObject() turned the returned QVariant into the desired type.
Now the actual type is returned in the first place.

Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/base_ref_reduction.py

@@ -1220,7 +1220,7 @@ def _add_data(self):
             while i < self._summary.angle_list.count():
 
                 current_item = self._summary.angle_list.item(i)
-                state = current_item.data(QtCore.Qt.UserRole).toPyObject()
+                state = current_item.data(QtCore.Qt.UserRole)
 
                 _q_min = self._summary.q_min_edit.text()
                 state.q_min = float(_q_min)
@@ -1288,7 +1288,7 @@ def _angle_changed(self):
         self._summary.remove_btn.setEnabled(False)  
         current_item =  self._summary.angle_list.currentItem()
         if current_item is not None:
-            state = current_item.data(QtCore.Qt.UserRole).toPyObject()
+            state = current_item.data(QtCore.Qt.UserRole)
             self.set_editing_state(state)
             self._reset_warnings()
         self._summary.angle_list.setEnabled(True)

Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/refl_data_simple.py

@@ -832,7 +832,7 @@ def _angle_changed(self):
         self._summary.remove_btn.setEnabled(False)  
         current_item =  self._summary.angle_list.currentItem()
         if current_item is not None:
-            state = current_item.data(QtCore.Qt.UserRole).toPyObject()
+            state = current_item.data(QtCore.Qt.UserRole)
             self.set_editing_state(state)
             self._reset_warnings()
         self._summary.angle_list.setEnabled(True)
@@ -993,7 +993,7 @@ def get_state(self):
             angle_offset_error = float(self._summary.angle_offset_error_edit.text())
 
         for i in range(self._summary.angle_list.count()):
-            data = self._summary.angle_list.item(i).data(QtCore.Qt.UserRole).toPyObject()
+            data = self._summary.angle_list.item(i).data(QtCore.Qt.UserRole)
             # Over-write Q binning with common binning
             data.q_min = q_min
             data.q_step = q_step
@@ -1093,4 +1093,4 @@ def get_editing_state(self):
         # Add here states that are data file dependent
         ##
 
-        return m
+        return m

Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/refl_reduction.py

@@ -119,7 +119,7 @@ def get_state(self):
             angle_offset_error = float(self._summary.angle_offset_error_edit.text())
 
         for i in range(self._summary.angle_list.count()):
-            data = self._summary.angle_list.item(i).data(QtCore.Qt.UserRole).toPyObject()
+            data = self._summary.angle_list.item(i).data(QtCore.Qt.UserRole)
             # Over-write Q binning with common binning
             data.q_min = q_min
             data.q_step = q_step
@@ -211,4 +211,4 @@ def _fourth_column_clicked(self, is_checked):
         self._summary.dq_over_q_label.setEnabled(is_checked)
         self._summary.dq_over_q.setEnabled(is_checked)
 
-
+

Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/refl_sf_calculator.py

@@ -304,7 +304,7 @@ def _add_data(self):
                 #print self._summary.angle_list.item(i)
                 current_item = self._summary.angle_list.item(i)
 
-                state = current_item.data(QtCore.Qt.UserRole).toPyObject()
+                state = current_item.data(QtCore.Qt.UserRole)
 
                 _tof_min = self._summary.tof_min.text()
                 _tof_max = self._summary.tof_max.text()
@@ -364,7 +364,7 @@ def _angle_changed(self):
         self._summary.remove_btn.setEnabled(False)  
         current_item =  self._summary.angle_list.currentItem()
         if current_item is not None:
-            state = current_item.data(QtCore.Qt.UserRole).toPyObject()
+            state = current_item.data(QtCore.Qt.UserRole)
             self.set_editing_state(state)
             self._reset_warnings()
         self._summary.angle_list.setEnabled(True)
@@ -439,7 +439,7 @@ def get_state(self):
         m.sf_factor_file = self._summary.cfg_scaling_factor_file_name.text()
 
         for i in range(self._summary.angle_list.count()):
-            data = self._summary.angle_list.item(i).data(QtCore.Qt.UserRole).toPyObject()
+            data = self._summary.angle_list.item(i).data(QtCore.Qt.UserRole)
             # Over-write incident medium with global incident medium
             data.incident_medium = incident_medium
             state_list.append(data)
@@ -597,4 +597,4 @@ def getSlitsValueAndLambda(self,file):
         return S1H, S2H, S1W, S2W, lambdaRequest
 
 
-
+

Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/refm_reduction.py

@@ -668,7 +668,7 @@ def _angle_changed(self):
         self._summary.remove_btn.setEnabled(False)  
         current_item =  self._summary.angle_list.currentItem()
         if current_item is not None:
-            state = current_item.data(QtCore.Qt.UserRole).toPyObject()
+            state = current_item.data(QtCore.Qt.UserRole)
             self.set_editing_state(state)
             self._reset_warnings()
         self._summary.angle_list.setEnabled(True)
@@ -817,7 +817,7 @@ def get_state(self):
             angle_offset_error = float(self._summary.angle_offset_error_edit.text())
 
         for i in range(self._summary.angle_list.count()):
-            data = self._summary.angle_list.item(i).data(QtCore.Qt.UserRole).toPyObject()
+            data = self._summary.angle_list.item(i).data(QtCore.Qt.UserRole)
             # Over-write Q binning with common binning
             data.q_min = q_min
             data.q_step = q_step
@@ -989,4 +989,4 @@ def call_back(self, peakmin, peakmax, backmin, backmax, tofmin, tofmax):
 
 
 
-
+