X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2Fqvariant_converter.py;h=0e160927733b7e5c68f2f5c5cc16c2c8a22b1ff1;hb=32eebaf8bf80d1ffd417bfe6d2c34e6cd3684f87;hp=b23bb47dc2bd985895b5db96dbfcf33bed2c677c;hpb=214612327f6fe0111c487f4019599e285a14f446;p=bertos.git

diff --git a/wizard/qvariant_converter.py b/wizard/qvariant_converter.py
index b23bb47d..0e160927 100644
--- a/wizard/qvariant_converter.py
+++ b/wizard/qvariant_converter.py
@@ -9,60 +9,9 @@
 # Author: Lorenzo Berni <duplo@develer.com>
 #
 
-from PyQt4.QtCore import *
+from PyQt4.QtCore import PYQT_VERSION_STR
 
-def getString(qvariant):
-    string = unicode(qvariant.toString())
-    return string
-
-def convertString(string):
-    return QVariant(string)
-
-def getStringList(qvariant):
-    string_list = [unicode(string) for string in qvariant.toStringList()]
-    return string_list
-
-def convertStringList(string_list):
-    return QVariant(QStringList(string_list))
-
-def getStringDict(qvariant):
-    dict_str_str = {}
-    for key, value in qvariant.toMap().items():
-        dict_str_str[unicode(key)] = unicode(value.toString())
-    return dict_str_str
-
-def convertStringDict(string_dict):
-    result_dict = {}
-    for key, value in string_dict.items():
-        result_dict[QString(key)] = QString(value)
-    return QVariant(result_dict)
-
-def getBool(qvariant):
-    return qvariant.toBool()
-
-def convertBool(boolean):
-    return QVariant(boolean)
-
-def getBoolDict(qvariant):
-    dict_str_bool = {}
-    for key, value in qvariant.toMap().items():
-        dict_str_bool[unicode(key)] = value.toBool()
-    return dict_str_bool
-
-def convertBoolDict(dict_str_bool):
-    result_dict = {}
-    for key, value in dict_str_bool.items():
-        result_dict[QString(key)] = value
-    return QVariant(result_dict)
-
-def getDict(qvariant):
-    dict_str_variant = {}
-    for key, value in qvariant.toMap().items():
-        dict_str_variant[unicode(key)] = value
-    return dict_str_variant
-
-def convertDict(dict_str_variant):
-    result_dict = {}
-    for key, value in dict_str_variant.items():
-        result_dict[QString(key)] = value
-    return QVariant(result_dict)
+if PYQT_VERSION_STR > "4.4.3":
+    from qvariant_converter_new import *
+else:
+    from qvariant_converter_old import *