Add the module qvariant_converter.py that abstracts the user from the qvariant_conver...

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2166 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py
index 6289efd839f4701885421139482eaf166efd8d60..e42bd2db72391d06eff9288aefadd279b401e157 100644 (file)
--- a/wizard/BCpuPage.py
+++ b/wizard/BCpuPage.py
@@ -12,10 +12,7 @@
 
 from BWizardPage import *
 import bertos_utils
-if PYQT_VERSION_STR > "4.4.3":
-    import qvariant_converter_new as qvariant_converter
-else:
-    import qvariant_converter_old as qvariant_converter
+import qvariant_converter
 
 class BCpuPage(BWizardPage):
     

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index 6b39ade822cdc4539a7c15ce4c2a5e1526ade410..2236fcfe3bd463eace52f6670a28ba0390a4e725 100644 (file)
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -14,10 +14,7 @@ import os
 from BWizardPage import *
 import BToolchainSearch
 import bertos_utils
-if PYQT_VERSION_STR > "4.4.3":
-    import qvariant_converter_new as qvariant_converter
-else:
-    import qvariant_converter_old as qvariant_converter
+import qvariant_converter
 
 class BToolchainPage(BWizardPage):
     

diff --git a/wizard/BToolchainSearch.py b/wizard/BToolchainSearch.py
index 67a85b98419dc1965acfab730b9a547308525017..de3a68407be2dd6e611dc83fd9d815f630d35b81 100644 (file)
--- a/wizard/BToolchainSearch.py
+++ b/wizard/BToolchainSearch.py
@@ -13,10 +13,7 @@ from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 import PyQt4.uic as uic
 
-if PYQT_VERSION_STR > "4.4.3":
-    import qvariant_converter_new as qvariant_converter
-else:
-    import qvariant_converter_old as qvariant_converter
+import qvariant_converter
 
 class BToolchainSearch(QDialog):
     

diff --git a/wizard/BVersionPage.py b/wizard/BVersionPage.py
index 1d078565794d51c3f93c55341ae52c3104477592..2f5a62605b9c3b833611964d91316b4d743e6709 100644 (file)
--- a/wizard/BVersionPage.py
+++ b/wizard/BVersionPage.py
@@ -12,10 +12,7 @@
 from PyQt4.QtGui import *
 from BWizardPage import *
 import bertos_utils
-if PYQT_VERSION_STR > "4.4.3":
-    import qvariant_converter_new as qvariant_converter
-else:
-    import qvariant_converter_old as qvariant_converter
+import qvariant_converter
 
 class BVersionPage(BWizardPage):
     

diff --git a/wizard/BWizardPage.py b/wizard/BWizardPage.py
index f7b60c37309599b25a3afd6ae4d30e8784a968cd..b4fc6217025419c244c07c57af0743e68ca89319 100644 (file)
--- a/wizard/BWizardPage.py
+++ b/wizard/BWizardPage.py
@@ -13,10 +13,7 @@ from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 from PyQt4 import uic
 
-if PYQT_VERSION_STR > "4.4.3":
-    import qvariant_converter_new as qvariant_converter
-else:
-    import qvariant_converter_old as qvariant_converter
+import qvariant_converter
 
 class BWizardPage(QWizardPage):
     

diff --git a/wizard/qvariant_converter.py b/wizard/qvariant_converter.py
new file mode 100644 (file)
index 0000000..0e16092
--- /dev/null
+++ b/wizard/qvariant_converter.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# encoding: utf-8
+#
+# Copyright 2009 Develer S.r.l. (http://www.develer.com/)
+# All rights reserved.
+#
+# $Id:$
+#
+# Author: Lorenzo Berni <duplo@develer.com>
+#
+
+from PyQt4.QtCore import PYQT_VERSION_STR
+
+if PYQT_VERSION_STR > "4.4.3":
+    from qvariant_converter_new import *
+else:
+    from qvariant_converter_old import *