Remove all usages of QVariant in Taurus

Avoid calling QVariant from taurus (use the python objects directly).

17 files changed, 202 insertions, 220 deletions

diff --git a/lib/taurus/external/qt/QtCore.py b/lib/taurus/external/qt/QtCore.py
index 1926f4f8..3d71acd9 100644
--- a/lib/taurus/external/qt/QtCore.py
+++ b/lib/taurus/external/qt/QtCore.py
@@ -94,7 +94,6 @@ elif PYQT4:
 
     # Deprecated. QVariant is kept for now to facilitate transition of existing
     # code but using QVariant should be avoided (with API 2 it is superfluous)
-    # TODO: Remove all references to QVariant in taurus
     @__deprecation(rel='4.0.1', alt='python objects directly')
     def QVariant(pyobj=None):
         return pyobj
diff --git a/lib/taurus/qt/qtcore/model/taurusmodel.py b/lib/taurus/qt/qtcore/model/taurusmodel.py
index c3d338b2..1bd10ae9 100644
--- a/lib/taurus/qt/qtcore/model/taurusmodel.py
+++ b/lib/taurus/qt/qtcore/model/taurusmodel.py
@@ -272,15 +272,11 @@ class TaurusBaseModel(Qt.QAbstractItemModel, Logger):
         elif role == QtQt.FontRole:
             ret = self.DftFont
         elif role == QtQt.UserRole:
-            ret = Qt.QVariant(item)
+            ret = item
         return ret
 
     def data(self, index, role=QtQt.DisplayRole):
         ret = self.pyData(index, role)
-        if ret is None:
-            ret = Qt.QVariant()
-        else:
-            ret = Qt.QVariant(ret)
         return ret
 
     def _setData(self, index, qvalue, role=QtQt.EditRole):
@@ -317,7 +313,7 @@ class TaurusBaseModel(Qt.QAbstractItemModel, Logger):
             elif role == QtQt.DecorationRole:
                 ret = self.columnIcon(section)
 
-        return Qt.QVariant(ret)
+        return ret
 
     def index(self, row, column, parent=Qt.QModelIndex()):
         if not self.hasIndex(row, column, parent):
diff --git a/lib/taurus/qt/qtgui/container/taurusmainwindow.py b/lib/taurus/qt/qtgui/container/taurusmainwindow.py
index 40915c02..00f2b6e4 100644
--- a/lib/taurus/qt/qtgui/container/taurusmainwindow.py
+++ b/lib/taurus/qt/qtgui/container/taurusmainwindow.py
@@ -666,12 +666,11 @@ class TaurusMainWindow(Qt.QMainWindow, TaurusBaseContainer):
         if group is not None:
             settings.beginGroup(group)
         # main window geometry
-        settings.setValue("MainWindow/State", Qt.QVariant(self.saveState()))
-        settings.setValue("MainWindow/Geometry",
-                          Qt.QVariant(self.saveGeometry()))
+        settings.setValue("MainWindow/State", self.saveState())
+        settings.setValue("MainWindow/Geometry", self.saveGeometry())
 
         # store the config dict
-        settings.setValue("TaurusConfig", Qt.QVariant(self.createQConfig()))
+        settings.setValue("TaurusConfig", self.createQConfig())
         if group is not None:
             settings.endGroup()
         self.info('MainWindow settings saved in "%s"' % settings.fileName())
diff --git a/lib/taurus/qt/qtgui/display/demo/qpixmapwidgetdemo.py b/lib/taurus/qt/qtgui/display/demo/qpixmapwidgetdemo.py
index 0227bda1..b72f721e 100644
--- a/lib/taurus/qt/qtgui/display/demo/qpixmapwidgetdemo.py
+++ b/lib/taurus/qt/qtgui/display/demo/qpixmapwidgetdemo.py
@@ -88,12 +88,12 @@ def demo():
             aspect_ratio_widget.addItems(
                 ["Ignore", "Keep", "Keep by expanding"])
             transformation_widget.addItems(["Fast", "Smooth"])
-            halign_widget.addItem("Left", Qt.QVariant(Qt.Qt.AlignLeft))
-            halign_widget.addItem("Center", Qt.QVariant(Qt.Qt.AlignHCenter))
-            halign_widget.addItem("Right", Qt.QVariant(Qt.Qt.AlignRight))
-            valign_widget.addItem("Top", Qt.QVariant(Qt.Qt.AlignTop))
-            valign_widget.addItem("Center", Qt.QVariant(Qt.Qt.AlignVCenter))
-            valign_widget.addItem("Bottom", Qt.QVariant(Qt.Qt.AlignBottom))
+            halign_widget.addItem("Left", Qt.Qt.AlignLeft)
+            halign_widget.addItem("Center", Qt.Qt.AlignHCenter)
+            halign_widget.addItem("Right", Qt.Qt.AlignRight)
+            valign_widget.addItem("Top", Qt.Qt.AlignTop)
+            valign_widget.addItem("Center", Qt.Qt.AlignVCenter)
+            valign_widget.addItem("Bottom", Qt.Qt.AlignBottom)
 
             pixmap_widget.textChanged.connect(self.changePixmap)
             aspect_ratio_widget.currentIndexChanged.connect(self.changeAspectRatio)
diff --git a/lib/taurus/qt/qtgui/extra_guiqwt/curvesmodel.py b/lib/taurus/qt/qtgui/extra_guiqwt/curvesmodel.py
index 2dc408ca..8dc49bde 100644
--- a/lib/taurus/qt/qtgui/extra_guiqwt/curvesmodel.py
+++ b/lib/taurus/qt/qtgui/extra_guiqwt/curvesmodel.py
@@ -181,78 +181,76 @@ class TaurusCurveItemTableModel(Qt.QAbstractTableModel):
 
     def data(self, index, role=Qt.Qt.DisplayRole):
         if not index.isValid() or not (0 <= index.row() < self.rowCount()):
-            return Qt.QVariant()
+            return None
         row = index.row()
         column = index.column()
         # Display Role
         if role == Qt.Qt.DisplayRole:
             if column == X:
-                return Qt.QVariant(str(self.curves[row].x.display))
+                return str(self.curves[row].x.display)
             elif column == Y:
-                return Qt.QVariant(str(self.curves[row].y.display))
+                return str(self.curves[row].y.display)
             elif column == TITLE:
-                return Qt.QVariant(str(self.curves[row].curveparam.label))
+                return str(self.curves[row].curveparam.label)
             else:
-                return Qt.QVariant()
+                return None
         elif role == Qt.Qt.DecorationRole:
             if column == X:
-                return Qt.QVariant(self.curves[row].x.icon)
+                return self.curves[row].x.icon
             elif column == Y:
-                return Qt.QVariant(self.curves[row].y.icon)
+                return self.curves[row].y.icon
             else:
-                return Qt.QVariant()
+                return None
         elif role == Qt.Qt.TextColorRole:
             if column == X:
-                Qt.QVariant(
-                    Qt.QColor(self.curves[row].x.ok and 'green' or 'red'))
+                Qt.QColor(self.curves[row].x.ok and 'green' or 'red')
             elif column == Y:
-                Qt.QVariant(
-                    Qt.QColor(self.curves[row].y.ok and 'green' or 'red'))
+                Qt.QColor(self.curves[row].y.ok and 'green' or 'red')
             else:
-                return Qt.QVariant()
+                return None
         elif role == SRC_ROLE:
             if column == X:
-                return Qt.QVariant(str(self.curves[row].taurusparam.xModel))
+                return str(self.curves[row].taurusparam.xModel)
             elif column == Y:
-                return Qt.QVariant(str(self.curves[row].taurusparam.yModel))
+                return str(self.curves[row].taurusparam.yModel)
             else:
-                return Qt.QVariant()
+                return None
         elif role == Qt.Qt.ToolTipRole:
             if column == X:
-                return Qt.QVariant(str(self.curves[row].taurusparam.xModel))
+                return str(self.curves[row].taurusparam.xModel)
             elif column == Y:
-                return Qt.QVariant(str(self.curves[row].taurusparam.yModel))
+                return str(self.curves[row].taurusparam.yModel)
             else:
-                return Qt.QVariant()
+                return None
         if role == Qt.Qt.EditRole:
             if column == X:
-                return Qt.QVariant(str(self.curves[row].taurusparam.xModel))
+                return str(self.curves[row].taurusparam.xModel)
             elif column == Y:
-                return Qt.QVariant(str(self.curves[row].taurusparam.yModel))
+                return str(self.curves[row].taurusparam.yModel)
             elif column == TITLE:
-                return Qt.QVariant(str(self.curves[row].curveparam.label))
+                return str(self.curves[row].curveparam.label)
             else:
-                return Qt.QVariant()
-        return Qt.QVariant()
+                return None
+        return None
 
     def headerData(self, section, orientation, role=Qt.Qt.DisplayRole):
         if role == Qt.Qt.TextAlignmentRole:
             if orientation == Qt.Qt.Horizontal:
-                return Qt.QVariant(int(Qt.Qt.AlignLeft | Qt.Qt.AlignVCenter))
-            return Qt.QVariant(int(Qt.Qt.AlignRight | Qt.Qt.AlignVCenter))
+                return int(Qt.Qt.AlignLeft | Qt.Qt.AlignVCenter)
+            return int(Qt.Qt.AlignRight | Qt.Qt.AlignVCenter)
         if role != Qt.Qt.DisplayRole:
-            return Qt.QVariant()
+            return None
         # So this is DisplayRole...
         if orientation == Qt.Qt.Horizontal:
             if section == X:
-                return Qt.QVariant("X source")
+                return "X source"
             elif section == Y:
-                return Qt.QVariant("Y Source")
+                return "Y Source"
             elif section == TITLE:
-                return Qt.QVariant("Title")
-            return Qt.QVariant()
+                return "Title"
+            return None
         else:
-            return Qt.QVariant(str(section + 1))
+            return str(section + 1)
 
     def flags(self, index):  # use this to set the editable flag when fix is selected
         if not index.isValid():
@@ -323,22 +321,20 @@ class TaurusCurveItemTableModel(Qt.QAbstractTableModel):
                 column = parent.columnCount()
         if data.hasFormat(TAURUS_ATTR_MIME_TYPE):
             self.setData(self.index(row, column),
-                         value=Qt.QVariant(str(data.data(TAURUS_ATTR_MIME_TYPE))))
+                         value=str(data.data(TAURUS_ATTR_MIME_TYPE)))
             return True
         elif data.hasFormat(TAURUS_MODEL_LIST_MIME_TYPE):
             models = str(data.data(TAURUS_MODEL_LIST_MIME_TYPE)).split()
             if len(models) == 1:
-                self.setData(self.index(row, column),
-                             value=Qt.QVariant(models[0]))
+                self.setData(self.index(row, column), value=models[0])
                 return True
             else:
                 self.insertRows(row, len(models))
                 for i, m in enumerate(models):
-                    self.setData(self.index(row + i, column),
-                                 value=Qt.QVariant(m))
+                    self.setData(self.index(row + i, column), value=m)
                 return True
         elif data.hasText():
-            self.setData(self.index(row, column), Qt.QVariant(data.text()))
+            self.setData(self.index(row, column), data.text())
             return True
         return False
 
@@ -459,8 +455,7 @@ class CurveItemConfDlg(Qt.QWidget):
         rowcount = self.model.rowCount()
         self.model.insertRows(rowcount, nmodels)
         for i, m in enumerate(models):
-            self.model.setData(self.model.index(
-                rowcount + i, Y), value=Qt.QVariant(m))
+            self.model.setData(self.model.index(rowcount + i, Y), value=m)
             title = self.model.data(self.model.index(
                 rowcount + i, Y))  # the display data
             self.model.setData(self.model.index(
diff --git a/lib/taurus/qt/qtgui/help/helppanel.py b/lib/taurus/qt/qtgui/help/helppanel.py
index e90e8229..d08b4912 100644
--- a/lib/taurus/qt/qtgui/help/helppanel.py
+++ b/lib/taurus/qt/qtgui/help/helppanel.py
@@ -51,7 +51,7 @@ class _HelpBrowser(Qt.QTextBrowser):
     def loadResource(self, type, url):
         if url.scheme() == "qthelp":
             if self.__help_engine:
-                return Qt.QVariant(self.__help_engine.fileData(url))
+                return self.__help_engine.fileData(url)
         return Qt.QTextBrowser.loadResource(self, type, url)
 
 
diff --git a/lib/taurus/qt/qtgui/input/tauruscombobox.py b/lib/taurus/qt/qtgui/input/tauruscombobox.py
index 213d9439..d7ec3602 100644
--- a/lib/taurus/qt/qtgui/input/tauruscombobox.py
+++ b/lib/taurus/qt/qtgui/input/tauruscombobox.py
@@ -115,7 +115,7 @@ class TaurusValueComboBox(Qt.QComboBox, TaurusBaseWritableWidget):
         Set the value for the widget to display, not the value of the
         attribute.
         """
-        index = self.findData(Qt.QVariant(value))
+        index = self.findData(value)
         self._setCurrentIndex(index)
 
     def updateStyle(self):
@@ -179,7 +179,7 @@ class TaurusValueComboBox(Qt.QComboBox, TaurusBaseWritableWidget):
         bs = self.blockSignals(True)
         try:
             for k, v in names:
-                self.addItem(k, Qt.QVariant(v))
+                self.addItem(k, v)
 
             # Ok, now we should see if the current value matches any
             # of the newly added names. This is kinda a refresh:
@@ -200,7 +200,7 @@ class TaurusValueComboBox(Qt.QComboBox, TaurusBaseWritableWidget):
                         a '%s' placeholder which will be substituted with
                         str(value). It defaults to 'UNKNOWN(%s)'.
         """
-        item = self.findData(Qt.QVariant(value))
+        item = self.findData(value)
         if item < 0:
             if '%s' in default:
                 return default % str(value)
diff --git a/lib/taurus/qt/qtgui/panel/taurusconfigeditor.py b/lib/taurus/qt/qtgui/panel/taurusconfigeditor.py
index 1a3925cb..15c95614 100644
--- a/lib/taurus/qt/qtgui/panel/taurusconfigeditor.py
+++ b/lib/taurus/qt/qtgui/panel/taurusconfigeditor.py
@@ -111,8 +111,8 @@ class QConfigEditorModel(Qt.QStandardItemModel):
             group = str(path).split(';', 1)[0]
         itemToMark = self.itemFromIndex(tmpindex.parent())
         while(itemToMark is not None):
-            itemToMark.setData(Qt.QVariant(
-                Qt.QFont("Arial", 10, Qt.QFont.Bold)), Qt.Qt.FontRole)
+            itemToMark.setData(
+                Qt.QFont("Arial", 10, Qt.QFont.Bold), Qt.Qt.FontRole)
             itemToMark = self.itemFromIndex(itemToMark.index().parent())
 
         self.markedItems.append(self._toDeleteIndex.parent())
@@ -180,14 +180,14 @@ class QConfigEditorModel(Qt.QStandardItemModel):
 
         self.itemFromIndex(index.sibling(index.row(), 1)
                            ).setText(str(type(eval(value))))
-        changedItem.setData(Qt.QVariant(
-            'Value has been changed. Old value: ' + str(changedItem.text())),
+        changedItem.setData(
+            'Value has been changed. Old value: ' + str(changedItem.text()),
             Qt.Qt.ToolTipRole)
-        itemToMark.setData(Qt.QVariant(Qt.QIcon.fromTheme('emblem-important')),
+        itemToMark.setData(Qt.QIcon.fromTheme('emblem-important'),
                            Qt.Qt.DecorationRole)
         while(itemToMark is not None):
-            itemToMark.setData(Qt.QVariant(
-                Qt.QFont("Arial", 10, Qt.QFont.Bold)), Qt.Qt.FontRole)
+            itemToMark.setData(
+                Qt.QFont("Arial", 10, Qt.QFont.Bold), Qt.Qt.FontRole)
             itemToMark = self.itemFromIndex(itemToMark.index().parent())
         self.saveSettings(group)
 
@@ -235,7 +235,7 @@ class QConfigEditorModel(Qt.QStandardItemModel):
         configdict = self.getTaurusConfigFromSettings()
         if configdict is not None:
             mainConfig[None] = configdict
-            item.setData(Qt.QVariant('None'), Qt.Qt.UserRole)
+            item.setData('None', Qt.Qt.UserRole)
             self.fillTaurusConfig(item, configdict)
         self._settings.beginGroup("Perspectives")
         self.perspectives = self._settings.childGroups()
@@ -243,7 +243,7 @@ class QConfigEditorModel(Qt.QStandardItemModel):
             item = Qt.QStandardItem(name)
             item.setEditable(False)
             # item.setSelectable(False)
-            path = Qt.QVariant("Perspectives/" + name)
+            path = "Perspectives/" + name
             item.setData(path, Qt.Qt.UserRole)
             root.appendRow(item)
             self._settings.beginGroup(name)
@@ -276,7 +276,7 @@ class QConfigEditorModel(Qt.QStandardItemModel):
                 item.appendRow(child)
 
                 txt = item.data(Qt.Qt.UserRole)
-                path = Qt.QVariant(txt + ";__itemConfigurations__;" + k)
+                path = txt + ";__itemConfigurations__;" + k
                 child.setData(path, Qt.Qt.UserRole)
                 # recursive call to fill all nodes
                 self.fillTaurusConfig(child, value)
@@ -290,7 +290,7 @@ class QConfigEditorModel(Qt.QStandardItemModel):
                 item.appendRow([child, typeV, valueV])
 
                 txt = item.data(Qt.Qt.UserRole)
-                path = Qt.QVariant(txt + ";__itemConfigurations__;" + k)
+                path = txt + ";__itemConfigurations__;" + k
                 child.setEditable(False)
                 typeV.setEditable(False)
 
@@ -316,7 +316,7 @@ class QConfigEditorModel(Qt.QStandardItemModel):
                     child.setEditable(False)
                     item.appendRow(child)
                     txt = item.data(Qt.Qt.UserRole)
-                    path = Qt.QVariant(txt + ";" + k)
+                    path = txt + ";" + k
                     child.setData(path, Qt.Qt.UserRole)
                     # recursive call to fill all nodes
                     self.fillTaurusConfig(child, value)
@@ -327,7 +327,7 @@ class QConfigEditorModel(Qt.QStandardItemModel):
                     child.setForeground(Qt.QBrush(Qt.QColor('gray')))
                     item.appendRow([child, typeV, valueV])
                     txt = item.data(Qt.Qt.UserRole)
-                    path = Qt.QVariant(txt + ";" + k)
+                    path = txt + ";" + k
 
                     child.setData(path, Qt.Qt.UserRole)
                     child.setEditable(False)
@@ -380,8 +380,10 @@ class QConfigEditorModel(Qt.QStandardItemModel):
             self._settings.beginGroup(group)
 
         # store the config dict
-        self._settings.setValue("TaurusConfig", Qt.QVariant(
-            Qt.QByteArray(pickle.dumps(self._configurationDictionaries[group]))))
+        self._settings.setValue(
+            "TaurusConfig",
+            Qt.QByteArray(pickle.dumps(self._configurationDictionaries[group]))
+        )
         if group is not None:
             self._settings.endGroup()
         #self.info('MainWindow settings saved in "%s"'%self._settings.fileName())
@@ -403,9 +405,9 @@ class QConfigEditorModel(Qt.QStandardItemModel):
         for index in self.markedItems:
             itemToMark = self.itemFromIndex(index)
             while(itemToMark is not None):
-                itemToMark.setData(Qt.QVariant(
-                    Qt.QFont("Arial", 10, Qt.QFont.Normal)), Qt.Qt.FontRole)
-                itemToMark.setData(Qt.QVariant(), Qt.Qt.DecorationRole)
+                itemToMark.setData(Qt.QFont("Arial", 10, Qt.QFont.Normal),
+                                   Qt.Qt.FontRole)
+                itemToMark.setData(None, Qt.Qt.DecorationRole)
                 itemToMark = self.itemFromIndex(itemToMark.index().parent())
 
 
diff --git a/lib/taurus/qt/qtgui/panel/taurusmessagepanel.py b/lib/taurus/qt/qtgui/panel/taurusmessagepanel.py
index aecdbff3..ae0554a8 100644
--- a/lib/taurus/qt/qtgui/panel/taurusmessagepanel.py
+++ b/lib/taurus/qt/qtgui/panel/taurusmessagepanel.py
@@ -284,7 +284,6 @@ class TaurusMessagePanel(Qt.QWidget):
         report_handlers = get_report_handlers()
         combo = self.reportComboBox()
         for name, report_handler in report_handlers.items():
-            name = Qt.QVariant(name)
             combo.addItem(report_handler.Label, name)
 
     def _onReportTriggered(self, index):
diff --git a/lib/taurus/qt/qtgui/panel/taurusmodellist.py b/lib/taurus/qt/qtgui/panel/taurusmodellist.py
index 6faaf253..e5dc8712 100644
--- a/lib/taurus/qt/qtgui/panel/taurusmodellist.py
+++ b/lib/taurus/qt/qtgui/panel/taurusmodellist.py
@@ -148,24 +148,24 @@ class TaurusModelModel(Qt.QAbstractListModel):
     def data(self, index, role=Qt.Qt.DisplayRole):
         '''reimplemented from :class:`Qt.QAbstractListModel`'''
         if not index.isValid() or not (0 <= index.row() < self.rowCount()):
-            return Qt.QVariant()
+            return None
         row = index.row()
         # Display Role
         if role == Qt.Qt.DisplayRole:
-            return Qt.QVariant(Qt.QString(self.items[row].display))
+            return Qt.QString(self.items[row].display)
         elif role == Qt.Qt.DecorationRole:
-            return Qt.QVariant(self.items[row].icon)
+            return self.items[row].icon
         elif role == Qt.Qt.TextColorRole:
             if not self.items[row].src:
-                return Qt.QVariant(Qt.QColor('gray'))
-            return Qt.QVariant(Qt.QColor(self.items[row].ok and 'green' or 'red'))
+                return Qt.QColor('gray')
+            return Qt.QColor(self.items[row].ok and 'green' or 'red')
         elif role == SRC_ROLE:
-            return Qt.QVariant(Qt.QString(self.items[row].src))
+            return Qt.QString(self.items[row].src)
         elif role == Qt.Qt.ToolTipRole:
-            return Qt.QVariant(Qt.QString(self.items[row].src))
+            return Qt.QString(self.items[row].src)
         if role == Qt.Qt.EditRole:
-            return Qt.QVariant(Qt.QString(self.items[row].src))
-        return Qt.QVariant()
+            return Qt.QString(self.items[row].src)
+        return None
 
     def flags(self, index):
         '''reimplemented from :class:`Qt.QAbstractListModel`'''
@@ -341,7 +341,7 @@ class TaurusModelList(Qt.QListView):
             self, "Display Value", "Display value for %s?" % src, Qt.QLineEdit.Normal, value)
         if not ok:
             return
-        self._model.setData(idx, Qt.QVariant(value), role=Qt.Qt.DisplayRole)
+        self._model.setData(idx, value, role=Qt.Qt.DisplayRole)
 
     def _onSelectionChanged(self, selected, deselected):
         '''updates the status of the actions that depend on the selection'''
diff --git a/lib/taurus/qt/qtgui/plot/curveprops.py b/lib/taurus/qt/qtgui/plot/curveprops.py
index c0118642..ccf6fca1 100755
--- a/lib/taurus/qt/qtgui/plot/curveprops.py
+++ b/lib/taurus/qt/qtgui/plot/curveprops.py
@@ -139,93 +139,90 @@ class CurvesTableModel(Qt.QAbstractTableModel):
 
     def data(self, index, role=Qt.Qt.DisplayRole):
         if not index.isValid() or not (0 <= index.row() < self.rowCount()):
-            return Qt.QVariant()
+            return None
         row = index.row()
         column = index.column()
         # Display Role
         if role == Qt.Qt.DisplayRole:
             if column == X:
-                return Qt.QVariant(Qt.QString(self.curves[row].x.display))
+                return Qt.QString(self.curves[row].x.display)
             elif column == Y:
-                return Qt.QVariant(Qt.QString(self.curves[row].y.display))
+                return Qt.QString(self.curves[row].y.display)
             elif column == TITLE:
-                return Qt.QVariant(Qt.QString(self.curves[row].title))
+                return Qt.QString(self.curves[row].title)
             elif column == VIS:
-                return Qt.QVariant(Qt.QString(self.curves[row].vis))
+                return Qt.QString(self.curves[row].vis)
             else:
-                return Qt.QVariant()
+                return None
         elif role == Qt.Qt.DecorationRole:
             if column == X:
-                return Qt.QVariant(self.curves[row].x.icon)
+                return self.curves[row].x.icon
             elif column == Y:
-                return Qt.QVariant(self.curves[row].y.icon)
+                return self.curves[row].y.icon
             elif column == TITLE:
-                return Qt.QVariant(Qt.QColor(self.curves[row].properties.lColor or 'black'))
+                return Qt.QColor(self.curves[row].properties.lColor or 'black')
             else:
-                return Qt.QVariant()
+                return None
         elif role == Qt.Qt.TextColorRole:
             if column == X:
-                Qt.QVariant(
-                    Qt.QColor(self.curves[row].x.ok and 'green' or 'red'))
+                Qt.QColor(self.curves[row].x.ok and 'green' or 'red')
             elif column == Y:
-                Qt.QVariant(
-                    Qt.QColor(self.curves[row].y.ok and 'green' or 'red'))
+                Qt.QColor(self.curves[row].y.ok and 'green' or 'red')
             else:
-                return Qt.QVariant()
+                return None
         elif role == SRC_ROLE:
             if column == X:
-                return Qt.QVariant(Qt.QString(self.curves[row].x.src))
+                return Qt.QString(self.curves[row].x.src)
             elif column == Y:
-                return Qt.QVariant(Qt.QString(self.curves[row].y.src))
+                return Qt.QString(self.curves[row].y.src)
             else:
-                return Qt.QVariant()
+                return None
         elif role == PROPS_ROLE:
             return self.curves[row].properties
         elif role == Qt.Qt.ToolTipRole:
             if column == X:
-                return Qt.QVariant(Qt.QString(self.curves[row].x.src))
+                return Qt.QString(self.curves[row].x.src)
             elif column == Y:
-                return Qt.QVariant(Qt.QString(self.curves[row].y.src))
+                return Qt.QString(self.curves[row].y.src)
             else:
-                return Qt.QVariant()
+                return None
         if role == Qt.Qt.EditRole:
             if column == X:
-                return Qt.QVariant(Qt.QString(self.curves[row].x.src))
+                return Qt.QString(self.curves[row].x.src)
             elif column == Y:
-                return Qt.QVariant(Qt.QString(self.curves[row].y.src))
+                return Qt.QString(self.curves[row].y.src)
             elif column == TITLE:
-                return Qt.QVariant(Qt.QString(self.curves[row].title))
+                return Qt.QString(self.curves[row].title)
             else:
-                return Qt.QVariant()
+                return None
         # Alignment
 #         elif role == Qt.Qt.TextAlignmentRole:
-#             return QVariant(int(Qt.AlignHCenter|Qt.AlignVCenter))
+#             return int(Qt.AlignHCenter|Qt.AlignVCenter)
         # Text Color
 #        elif role == Qt.Qt.TextColorRole:
-# return Qt.QVariant(Qt.QColor(self.curves[row].properties.lColor or
-# 'black'))
-        return Qt.QVariant()
+#            return Qt.QColor(self.curves[row].properties.lColor or 'black')
+        return None
 
     def headerData(self, section, orientation, role=Qt.Qt.DisplayRole):
         if role == Qt.Qt.TextAlignmentRole:
             if orientation == Qt.Qt.Horizontal:
-                return Qt.QVariant(int(Qt.Qt.AlignLeft | Qt.Qt.AlignVCenter))
-            return Qt.QVariant(int(Qt.Qt.AlignRight | Qt.Qt.AlignVCenter))
+                return int(Qt.Qt.AlignLeft | Qt.Qt.AlignVCenter)
+            return int(Qt.Qt.AlignRight | Qt.Qt.AlignVCenter)
         if role != Qt.Qt.DisplayRole:
-            return Qt.QVariant()
+            return None
         # So this is DisplayRole...
         if orientation == Qt.Qt.Horizontal:
             if section == X:
-                return Qt.QVariant("X source")
+                return "X source"
             elif section == Y:
-                return Qt.QVariant("Y Source")
+                return "Y Source"
             elif section == TITLE:
-                return Qt.QVariant("Title")
+                return "Title"
             elif section == VIS:
-                return Qt.QVariant("Shown at")
-            return Qt.QVariant()
+                return "Shown at"
+            return None
         else:
-            return Qt.QVariant(Qt.QString.number(section + 1))
+            return Qt.QString.number(section + 1)
 
     def flags(self, index):  # use this to set the editable flag when fix is selected
         if not index.isValid():
@@ -298,22 +295,20 @@ class CurvesTableModel(Qt.QAbstractTableModel):
                 column = parent.columnCount()
         if data.hasFormat(TAURUS_ATTR_MIME_TYPE):
             self.setData(self.index(row, column),
-                         value=Qt.QVariant(str(data.data(TAURUS_ATTR_MIME_TYPE))))
+                         value=str(data.data(TAURUS_ATTR_MIME_TYPE)))
             return True
         elif data.hasFormat(TAURUS_MODEL_LIST_MIME_TYPE):
             models = str(data.data(TAURUS_MODEL_LIST_MIME_TYPE)).split()
             if len(models) == 1:
-                self.setData(self.index(row, column),
-                             value=Qt.QVariant(models[0]))
+                self.setData(self.index(row, column), value=models[0])
                 return True
             else:
                 self.insertRows(row, len(models))
                 for i, m in enumerate(models):
-                    self.setData(self.index(row + i, column),
-                                 value=Qt.QVariant(m))
+                    self.setData(self.index(row + i, column), value=m)
                 return True
         elif data.hasText():
-            self.setData(self.index(row, column), Qt.QVariant(data.text()))
+            self.setData(self.index(row, column), data.text())
             return True
         return False
 
@@ -366,8 +361,8 @@ class CurvePropertiesView(Qt.QAbstractItemView):
         self.ui.lColorCB.addItem("")
         for color in NamedColors:
             icon = self._colorIcon(color)
-            self.ui.sColorCB.addItem(icon, "", Qt.QVariant(Qt.QColor(color)))
-            self.ui.lColorCB.addItem(icon, "", Qt.QVariant(Qt.QColor(color)))
+            self.ui.sColorCB.addItem(icon, "", Qt.QColor(color))
+            self.ui.lColorCB.addItem(icon, "", Qt.QColor(color))
 
         self._emptyProps = CurveAppearanceProperties()
         self.showProperties(self._emptyProps)
@@ -516,22 +511,24 @@ class CurvePropertiesView(Qt.QAbstractItemView):
         if prop.sColor is None:
             index = 0
         else:
-            index = self.ui.sColorCB.findData(
-                Qt.QVariant(Qt.QColor(prop.sColor)))
+            index = self.ui.sColorCB.findData(Qt.QColor(prop.sColor))
         if index == -1:  # if the color is not one of the supported colors, add it to the combobox
             index = self.ui.sColorCB.count()  # set the index to what will be the added one
-            self.ui.sColorCB.addItem(self._colorIcon(
-                Qt.QColor(prop.sColor)), "", Qt.QVariant(Qt.QColor(prop.sColor)))
+            self.ui.sColorCB.addItem(self._colorIcon(Qt.QColor(prop.sColor)),
+                                     "",
+                                     Qt.QColor(prop.sColor)
+                                     )
         self.ui.sColorCB.setCurrentIndex(index)
         if prop.lColor is None:
             index = 0
         else:
-            index = self.ui.lColorCB.findData(
-                Qt.QVariant(Qt.QColor(prop.lColor)))
+            index = self.ui.lColorCB.findData(Qt.QColor(prop.lColor))
         if index == -1:  # if the color is not one of the supported colors, add it to the combobox
             index = self.ui.lColorCB.count()  # set the index to what will be the added one
-            self.ui.lColorCB.addItem(self._colorIcon(
-                Qt.QColor(prop.lColor)), "", Qt.QVariant(Qt.QColor(prop.lColor)))
+            self.ui.lColorCB.addItem(self._colorIcon(Qt.QColor(prop.lColor)),
+                                     "",
+                                     Qt.QColor(prop.lColor)
+                                     )
         self.ui.lColorCB.setCurrentIndex(index)
         # set the Fill Checkbox. The prop.sFill value can be in 3 states: True,
         # False and None
diff --git a/lib/taurus/qt/qtgui/plot/curvesAppearanceChooserDlg.py b/lib/taurus/qt/qtgui/plot/curvesAppearanceChooserDlg.py
index 9fe20ce4..67fb42d7 100644
--- a/lib/taurus/qt/qtgui/plot/curvesAppearanceChooserDlg.py
+++ b/lib/taurus/qt/qtgui/plot/curvesAppearanceChooserDlg.py
@@ -124,8 +124,8 @@ class CurvesAppearanceChooser(Qt.QWidget):
             self.resetBT.hide()
         for color in NamedColors:
             icon = self._colorIcon(color)
-            self.sColorCB.addItem(icon, "", Qt.QVariant(Qt.QColor(color)))
-            self.lColorCB.addItem(icon, "", Qt.QVariant(Qt.QColor(color)))
+            self.sColorCB.addItem(icon, "", Qt.QColor(color))
+            self.lColorCB.addItem(icon, "", Qt.QColor(color))
         self.__itemsDict = CaselessDict()
         self.setCurves(curvePropDict)
         # set the icon for the background button (stupid designer limitations
@@ -170,7 +170,7 @@ class CurvesAppearanceChooser(Qt.QWidget):
             # create and insert the item
             item = Qt.QListWidgetItem(Qt.QString(prop.title), self.curvesLW)
             self.__itemsDict[name] = item
-            item.setData(self.NAME_ROLE, Qt.QVariant(Qt.QString(name)))
+            item.setData(self.NAME_ROLE, Qt.QString(name))
             item.setToolTip("<b>Curve Name:</b> %s" % name)
             item.setFlags(Qt.Qt.ItemIsEnabled | Qt.Qt.ItemIsSelectable |
                           Qt.Qt.ItemIsUserCheckable | Qt.Qt.ItemIsDragEnabled | Qt.Qt.ItemIsEditable)
@@ -235,20 +235,24 @@ class CurvesAppearanceChooser(Qt.QWidget):
         if prop.sColor is None:
             index = 0
         else:
-            index = self.sColorCB.findData(Qt.QVariant(Qt.QColor(prop.sColor)))
+            index = self.sColorCB.findData(Qt.QColor(prop.sColor))
         if index == -1:  # if the color is not one of the supported colors, add it to the combobox
             index = self.sColorCB.count()  # set the index to what will be the added one
-            self.sColorCB.addItem(self._colorIcon(
-                Qt.QColor(prop.sColor)), "", Qt.QVariant(Qt.QColor(prop.sColor)))
+            self.sColorCB.addItem(self._colorIcon(Qt.QColor(prop.sColor)),
+                                  "",
+                                  Qt.QColor(prop.sColor)
+                                  )
         self.sColorCB.setCurrentIndex(index)
         if prop.lColor is None:
             index = 0
         else:
-            index = self.lColorCB.findData(Qt.QVariant(Qt.QColor(prop.lColor)))
+            index = self.lColorCB.findData(Qt.QColor(prop.lColor))
         if index == -1:  # if the color is not one of the supported colors, add it to the combobox
             index = self.lColorCB.count()  # set the index to what will be the added one
-            self.lColorCB.addItem(self._colorIcon(
-                Qt.QColor(prop.lColor)), "", Qt.QVariant(Qt.QColor(prop.lColor)))
+            self.lColorCB.addItem(self._colorIcon(Qt.QColor(prop.lColor)),
+                                  "",
+                                  Qt.QColor(prop.lColor)
+                                  )
         self.lColorCB.setCurrentIndex(index)
         # set the Fill Checkbox. The prop.sFill value can be in 3 states: True,
         # False and None
diff --git a/lib/taurus/qt/qtgui/plot/taurusplotconf.py b/lib/taurus/qt/qtgui/plot/taurusplotconf.py
index 1a7c5f02..d6a8e509 100644
--- a/lib/taurus/qt/qtgui/plot/taurusplotconf.py
+++ b/lib/taurus/qt/qtgui/plot/taurusplotconf.py
@@ -130,7 +130,7 @@ class TaurusPlotConfDlg(Qt.QWidget):
         self.model.insertRows(rowcount, nmodels)
         for i, m in enumerate(models):
             self.model.setData(self.model.index(rowcount + i, curveprops.Y),
-                               value=Qt.QVariant(m))
+                               value=m)
 
     def onApply(self):
         print("APPLY!!! (todo)")
diff --git a/lib/taurus/qt/qtgui/table/qlogtable.py b/lib/taurus/qt/qtgui/table/qlogtable.py
index 0c2e1fdc..3c61cb8d 100644
--- a/lib/taurus/qt/qtgui/table/qlogtable.py
+++ b/lib/taurus/qt/qtgui/table/qlogtable.py
@@ -181,74 +181,74 @@ class QLoggingTableModel(Qt.QAbstractTableModel, logging.Handler):
 
     def data(self, index, role=Qt.Qt.DisplayRole):
         if not index.isValid() or not (0 <= index.row() < len(self._records)):
-            return Qt.QVariant()
+            return None
         record = self.getRecord(index)
         column = index.column()
         if role == Qt.Qt.DisplayRole:
             if column == LEVEL:
-                return Qt.QVariant(record.levelname)
+                return record.levelname
             elif column == TIME:
                 dt = datetime.datetime.fromtimestamp(record.created)
-                return Qt.QVariant(str(dt))
-                # return Qt.QVariant(dt.strftime("%Y-%m-%d %H:%m:%S.%f"))
+                return str(dt)
+                # return dt.strftime("%Y-%m-%d %H:%m:%S.%f")
             elif column == MSG:
-                return Qt.QVariant(record.getMessage())
+                return record.getMessage()
             elif column == NAME:
-                return Qt.QVariant(record.name)
+                return record.name
             elif column == ORIGIN:
-                return Qt.QVariant(_get_record_origin_str(record))
+                return _get_record_origin_str(record)
         elif role == Qt.Qt.TextAlignmentRole:
             if column in (LEVEL, MSG):
-                return Qt.QVariant(Qt.Qt.AlignLeft | Qt.Qt.AlignVCenter)
-            return Qt.QVariant(Qt.Qt.AlignRight | Qt.Qt.AlignVCenter)
+                return Qt.Qt.AlignLeft | Qt.Qt.AlignVCenter
+            return Qt.Qt.AlignRight | Qt.Qt.AlignVCenter
         elif role == Qt.Qt.BackgroundRole:
             if column == LEVEL:
-                return Qt.QVariant(getBrushForLevel(record.levelno)[0])
+                return getBrushForLevel(record.levelno)[0]
         elif role == Qt.Qt.ForegroundRole:
             if column == LEVEL:
-                return Qt.QVariant(getBrushForLevel(record.levelno)[1])
+                return getBrushForLevel(record.levelno)[1]
         elif role == Qt.Qt.ToolTipRole:
-            return Qt.QVariant(_get_record_origin_tooltip(record))
+            return _get_record_origin_tooltip(record)
         elif role == Qt.Qt.SizeHintRole:
             return self._getSizeHint(column)
         # elif role == Qt.Qt.StatusTipRole:
         # elif role == Qt.Qt.CheckStateRole:
         elif role == Qt.Qt.FontRole:
-            return Qt.QVariant(self.DftFont)
-        return Qt.QVariant()
+            return self.DftFont
+        return None
 
     def _getSizeHint(self, column):
-        return Qt.QVariant(QLoggingTableModel.DftColSize[column])
+        return QLoggingTableModel.DftColSize[column]
 
     def headerData(self, section, orientation, role=Qt.Qt.DisplayRole):
         if role == Qt.Qt.TextAlignmentRole:
             if orientation == Qt.Qt.Horizontal:
-                return Qt.QVariant(int(Qt.Qt.AlignLeft | Qt.Qt.AlignVCenter))
-            return Qt.QVariant(int(Qt.Qt.AlignRight | Qt.Qt.AlignVCenter))
+                return int(Qt.Qt.AlignLeft | Qt.Qt.AlignVCenter)
+            return int(Qt.Qt.AlignRight | Qt.Qt.AlignVCenter)
         elif role == Qt.Qt.SizeHintRole:
             if orientation == Qt.Qt.Vertical:
-                return Qt.QVariant(Qt.QSize(50, 20))
+                return Qt.QSize(50, 20)
             else:
                 return self._getSizeHint(section)
         elif role == Qt.Qt.FontRole:
-            return Qt.QVariant(Qt.QFont("Mono", 8))
+            return Qt.QFont("Mono", 8)
         elif role == Qt.Qt.ToolTipRole:
             if section == LEVEL:
-                return Qt.QVariant("log level")
+                return "log level"
             elif section == TIME:
-                return Qt.QVariant("log time stamp")
+                return "log time stamp"
             elif section == MSG:
-                return Qt.QVariant("log message")
+                return "log message"
             elif section == NAME:
-                return Qt.QVariant("object who recorded the log")
+                return "object who recorded the log"
             elif section == ORIGIN:
-                return Qt.QVariant("the host, process and thread where the "
-                                   "log was executed from")
+                return ("the host, process and thread where the"
+                        + " log was executed from")
         if role != Qt.Qt.DisplayRole:
-            return Qt.QVariant()
+            return None
         if orientation == Qt.Qt.Horizontal:
-            return Qt.QVariant(HORIZ_HEADER[section])
-        return Qt.QVariant(int(section + 1))
+            return HORIZ_HEADER[section]
+        return int(section + 1)
 
     def insertRows(self, position, rows=1, index=Qt.QModelIndex()):
         self.beginInsertRows(Qt.QModelIndex(), position, position + rows - 1)
diff --git a/lib/taurus/qt/qtgui/table/taurusvaluestable.py b/lib/taurus/qt/qtgui/table/taurusvaluestable.py
index 2af5d1bb..567ea37c 100755
--- a/lib/taurus/qt/qtgui/table/taurusvaluestable.py
+++ b/lib/taurus/qt/qtgui/table/taurusvaluestable.py
@@ -103,7 +103,7 @@ class TaurusValuesIOTableModel(Qt.QAbstractTableModel):
         else:
             tabledata = self._wtabledata
         if not index.isValid() or not (0 <= index.row() < len(tabledata)):
-            return Qt.QVariant()
+            return None
         elif role == Qt.Qt.DisplayRole:
             value = None
             rc = (index.row(), index.column())
@@ -118,7 +118,7 @@ class TaurusValuesIOTableModel(Qt.QAbstractTableModel):
                     value = value.magnitude
             # cast the value to a standard python type
             value = self.typeCastingMap[tabledata.dtype.kind](value)
-            return Qt.QVariant(value)
+            return value
         elif role == Qt.Qt.DecorationRole:
             if ((index.row(), index.column()) in self._modifiedDict
                     and self._writeMode):
@@ -130,7 +130,7 @@ class TaurusValuesIOTableModel(Qt.QAbstractTableModel):
                         icon = Qt.QIcon.fromTheme('emblem-important')
                 else:
                     icon = Qt.QIcon.fromTheme('document-save')
-                return Qt.QVariant(icon)
+                return icon
         elif role == Qt.Qt.EditRole:
             value = None
             if ((index.row(), index.column()) in self._modifiedDict
@@ -140,36 +140,36 @@ class TaurusValuesIOTableModel(Qt.QAbstractTableModel):
                 value = tabledata[index.row(), index.column()]
                 if tabledata.dtype == bool:
                     value = bool(value)
-            return Qt.QVariant(value)
+            return value
         elif role == Qt.Qt.BackgroundRole:
             if self._writeMode:
-                return Qt.QVariant(Qt.QColor(22, 223, 21, 50))
+                return Qt.QColor(22, 223, 21, 50)
             else:
-                return Qt.QVariant(Qt.QColor('white'))
+                return Qt.QColor('white')
         elif role == Qt.Qt.ForegroundRole:
             if ((index.row(), index.column()) in self._modifiedDict
                     and self._writeMode):
                 if self.getAttr().type in [DataType.Integer, DataType.Float]:
                     value = self._modifiedDict[(index.row(), index.column())]
                     if not self.inAlarmRange(value):
-                        return Qt.QVariant(Qt.QColor('blue'))
+                        return Qt.QColor('blue')
                     else:
-                        return Qt.QVariant(Qt.QColor('orange'))
+                        return Qt.QColor('orange')
                 else:
-                    return Qt.QVariant(Qt.QColor('blue'))
-            return Qt.QVariant(Qt.QColor('black'))
+                    return Qt.QColor('blue')
+            return Qt.QColor('black')
         elif role == Qt.Qt.FontRole:
             if ((index.row(), index.column()) in self._modifiedDict
                     and self._writeMode):
-                return Qt.QVariant(Qt.QFont("Arial", 10, Qt.QFont.Bold))
+                return Qt.QFont("Arial", 10, Qt.QFont.Bold)
         elif role == Qt.Qt.ToolTipRole:
             if ((index.row(), index.column()) in self._modifiedDict
                     and self._writeMode):
                 value = str(self._modifiedDict[(index.row(), index.column())])
                 msg = 'Original value: %s.\nNew value that will be saved: %s' %\
                       (str(tabledata[index.row(), index.column()]), value)
-                return Qt.QVariant(msg)
-        return Qt.QVariant()
+                return msg
+        return None
 
     def getAttr(self):
         return self._attr
@@ -518,7 +518,7 @@ class TaurusValuesIOTableDelegate(Qt.QStyledItemDelegate):
                 text = editor.text()
             text = str(text)
         if(text != self._initialText) & (text != ""):
-            model.addValue(index, Qt.QVariant(text))
+            model.addValue(index, text)
             hh = self.parent().horizontalHeader()
             if hh.length() > 0:
                 try:
diff --git a/lib/taurus/qt/qtgui/taurusgui/paneldescriptionwizard.py b/lib/taurus/qt/qtgui/taurusgui/paneldescriptionwizard.py
index fd4091ff..3cd3cd9c 100644
--- a/lib/taurus/qt/qtgui/taurusgui/paneldescriptionwizard.py
+++ b/lib/taurus/qt/qtgui/taurusgui/paneldescriptionwizard.py
@@ -485,25 +485,25 @@ class CommTableModel(Qt.QAbstractTableModel):
     def headerData(self, section, orientation, role=Qt.Qt.DisplayRole):
         if role == Qt.Qt.TextAlignmentRole:
             if orientation == Qt.Qt.Horizontal:
-                return Qt.QVariant(int(Qt.Qt.AlignLeft | Qt.Qt.AlignVCenter))
-            return Qt.QVariant(int(Qt.Qt.AlignRight | Qt.Qt.AlignVCenter))
+                return int(Qt.Qt.AlignLeft | Qt.Qt.AlignVCenter)
+            return int(Qt.Qt.AlignRight | Qt.Qt.AlignVCenter)
         if role != Qt.Qt.DisplayRole:
-            return Qt.QVariant()
+            return None
         # So this is DisplayRole...
         if orientation == Qt.Qt.Horizontal:
             if section == self.UID:
-                return Qt.QVariant("Data UID")
+                return "Data UID"
             elif section == self.R:
-                return Qt.QVariant("Reader (slot)")
+                return "Reader (slot)"
             elif section == self.W:
-                return Qt.QVariant("Writer (signal)")
-            return Qt.QVariant()
+                return "Writer (signal)"
+            return None
         else:
-            return Qt.QVariant(Qt.QString('%i' % (section + 1)))
+            return Qt.QString('%i' % (section + 1))
 
     def data(self, index, role=Qt.Qt.DisplayRole):
         if not index.isValid() or not (0 <= index.row() < self.rowCount()):
-            return Qt.QVariant()
+            return None
         row = index.row()
         column = index.column()
         # Display Role
@@ -514,8 +514,8 @@ class CommTableModel(Qt.QAbstractTableModel):
                     text = '(enter UID)'
                 else:
                     text = '(not registered)'
-            return Qt.QVariant(Qt.QString(text))
-        return Qt.QVariant()
+            return Qt.QString(text)
+        return None
 
     def flags(self, index):
         return (Qt.Qt.ItemIsEnabled | Qt.Qt.ItemIsEditable | Qt.Qt.ItemIsDragEnabled | Qt.Qt.ItemIsDropEnabled | Qt.Qt.ItemIsSelectable)
@@ -589,7 +589,7 @@ class CommItemDelegate(Qt.QStyledItemDelegate):
         editor.setEditText('')
 
     def setModelData(self, editor, model, index):
-        model.setData(index, Qt.QVariant(editor.currentText()))
+        model.setData(index, editor.currentText())
 
 
 class PanelDescriptionWizard(Qt.QWizard, TaurusBaseWidget):
diff --git a/lib/taurus/qt/qtgui/util/tauruscolor.py b/lib/taurus/qt/qtgui/util/tauruscolor.py
index f9a469fb..ab53fcf2 100644
--- a/lib/taurus/qt/qtgui/util/tauruscolor.py
+++ b/lib/taurus/qt/qtgui/util/tauruscolor.py
@@ -37,6 +37,7 @@ from taurus.external.qt import Qt
 from taurus.core.util.colors import ColorPalette, \
     DEVICE_STATE_DATA, ATTRIBUTE_QUALITY_DATA
 from taurus.core.taurusbasetypes import AttrQuality
+from taurus.core.util.log import deprecation_decorator
 
 
 class QtColorPalette(ColorPalette):
@@ -47,8 +48,6 @@ class QtColorPalette(ColorPalette):
         self._qcolor_cache_bg = dict()
         self._qbrush_cache_fg = dict()
         self._qbrush_cache_bg = dict()
-        self._qvariant_cache_fg = dict()
-        self._qvariant_cache_bg = dict()
 
     def qbrush(self, stoq):
         # print stoq
@@ -81,18 +80,10 @@ class QtColorPalette(ColorPalette):
 
         return (b[name], f[name])
 
+    @deprecation_decorator(alt='QtColorPalette.qcolor()', rel='4.5')
     def qvariant(self, stoq):
         """Returns the color for the specified state or quality"""
-        name = self._decoder(stoq)
-
-        f = self._qvariant_cache_fg
-        b = self._qvariant_cache_bg
-        if name not in f:
-            (back, fore) = self.qcolor(name)
-            f[name] = Qt.QVariant(fore)
-            b[name] = Qt.QVariant(back)
-
-        return (b[name], f[name])
+        return self.qcolor(stoq)