Update preset.

[bertos.git] / wizard / qvariant_converter_old.py

diff --git a/wizard/qvariant_converter_old.py b/wizard/qvariant_converter_old.py
index dbdeb4b4fb245a41922296fd517891aba29083af..ee410b9f0ce8bb5fa15eb9215c1d8bcbf4b929a1 100644 (file)
--- a/wizard/qvariant_converter_old.py
+++ b/wizard/qvariant_converter_old.py
@@ -1,19 +1,49 @@
 #!/usr/bin/env python
 # encoding: utf-8
 #
-# Copyright 2009 Develer S.r.l. (http://www.develer.com/)
-# All rights reserved.
+# This file is part of BeRTOS.
+#
+# Bertos is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# As a special exception, you may use this file as part of a free software
+# library without restriction.  Specifically, if other files instantiate
+# templates or use macros or inline functions from this file, or you compile
+# this file and link it with other files to produce an executable, this
+# file does not by itself cause the resulting executable to be covered by
+# the GNU General Public License.  This exception does not however
+# invalidate any other reasons why the executable file might be covered by
+# the GNU General Public License.
+#
+# Copyright 2008 Develer S.r.l. (http://www.develer.com/)
 #
-# $Id:$
 #
 # Author: Lorenzo Berni <duplo@develer.com>
 #
 
+"""
+Awful module for the conversion from python types to qvariant, for make the wizard compatible with older version of pyqt (<= 4.4.3)
+"""
+
 from PyQt4.QtCore import *
 import pickle
 
 def getString(qvariant):
-    string = unicode(qvariant.toString())
+    if type(qvariant) == str or type(qvariant) == unicode:
+        string = qvariant
+    else:
+        string = unicode(qvariant.toString())
     return string
 
 def convertString(string):
@@ -35,13 +65,14 @@ def convertStringList(string_list):
     return QVariant(QStringList(result))
 
 def getStringDict(qvariant):
+    a = str(qvariant.toByteArray())
     if len(a) == 0:
-        dict_str_bool = {}
+        dict_str_str = {}
     else:
-        dict_str_bool = pickle.loads(a)
-    return dict_str_bool
+        dict_str_str = pickle.loads(a)
+    return dict_str_str
 
-def convertStringDict(string_dict):
+def convertStringDict(dict_str_str):
     a = pickle.dumps(dict_str_str)
     return QVariant(QByteArray(a))