From: duplo Date: Tue, 15 Dec 2009 09:12:18 +0000 (+0000) Subject: Change the name convention for the qvariant_converter implementation files. X-Git-Tag: 2.4.0~76 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=1f461694c0ebcae10689323f3bb51f91ea21d718;p=bertos.git Change the name convention for the qvariant_converter implementation files. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3121 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/wizard/qvariant_converter.py b/wizard/qvariant_converter.py index 9b24b0c1..97dccefa 100644 --- a/wizard/qvariant_converter.py +++ b/wizard/qvariant_converter.py @@ -35,11 +35,14 @@ from PyQt4.QtCore import PYQT_VERSION_STR +# Choose the right version of the qvariant_converter module. It's awful, +# I know, but this is the only solution in order to mantain compatibility +# with older PyQt4 version. if PYQT_VERSION_STR <= "4.4.3": from qvariant_converter_old import * elif PYQT_VERSION_STR < "4.5.0": - from qvariant_converter_new import * + from qvariant_converter_4_4 import * elif PYQT_VERSION_STR < "4.6.0": - from qvariant_converter_newer import * + from qvariant_converter_4_5 import * else: - from qvariant_converter_newest import * + from qvariant_converter_4_6 import * diff --git a/wizard/qvariant_converter_4_4.py b/wizard/qvariant_converter_4_4.py new file mode 100644 index 00000000..fc7c93cd --- /dev/null +++ b/wizard/qvariant_converter_4_4.py @@ -0,0 +1,92 @@ +#!/usr/bin/env python +# encoding: utf-8 +# +# 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 +# + +from PyQt4.QtCore import * + +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) diff --git a/wizard/qvariant_converter_4_5.py b/wizard/qvariant_converter_4_5.py new file mode 100644 index 00000000..597d01ce --- /dev/null +++ b/wizard/qvariant_converter_4_5.py @@ -0,0 +1,105 @@ +#!/usr/bin/env python +# encoding: utf-8 +# +# This file is part of slimqc. +# +# Slimqc 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 2009 Develer S.r.l. (http://www.develer.com/) +# +# $Id$ +# +# Author: Lorenzo Berni +# + +from PyQt4.QtCore import * + +def getString(qvariant): + if type(qvariant) != QVariant: + return qvariant + string = unicode(qvariant.toString()) + return string + +def convertString(string): + return QVariant(string) + +def getStringList(qvariant): + if type(qvariant) != QVariant: + return 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 = {} + try: + for key, value in qvariant.toPyObject().items(): + dict_str_str[unicode(key)] = unicode(value) + except: + pass + 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 = {} + try: + for key, value in qvariant.toPyObject().items(): + dict_str_bool[unicode(key)] = value.toBool() + except: + pass + return dict_str_bool + +def convertBoolDict(dict_str_bool): + result_dict = {} + for key, value in dict_str_bool.items(): + result_dict[QString(key)] = QVariant(value) + return QVariant(result_dict) + +def getDict(qvariant): + dict_str_variant = {} + try: + for key, value in qvariant.toPyObject().items(): + dict_str_variant[unicode(key)] = value + except: + pass + 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) diff --git a/wizard/qvariant_converter_4_6.py b/wizard/qvariant_converter_4_6.py new file mode 100644 index 00000000..f31bb92d --- /dev/null +++ b/wizard/qvariant_converter_4_6.py @@ -0,0 +1,103 @@ +#!/usr/bin/env python +# encoding: utf-8 +# +# This file is part of slimqc. +# +# Slimqc 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 2009 Develer S.r.l. (http://www.develer.com/) +# +# $Id$ +# +# Author: Lorenzo Berni +# + +from PyQt4.QtCore import * + +def getString(qvariant): + if type(qvariant) != QVariant: + return qvariant + string = unicode(qvariant.toString()) + return string + +def convertString(string): + return QVariant(string) + +def getStringList(qvariant): + if type(qvariant) == QVariant: + tmp = qvariant.toPyObject() + else: + tmp = qvariant + string_list = [] + if tmp: + string_list = [unicode(string) for string in tmp] + return string_list + +def convertStringList(string_list): + return QVariant(string_list) + +def getStringDict(qvariant): + dict_str_str = {} + try: + for key, value in qvariant.toPyObject().items(): + dict_str_str[unicode(key)] = unicode(value) + except: + pass + return dict_str_str + +def convertStringDict(string_dict): + return QVariant(string_dict) + +def getBool(qvariant): + return qvariant.toBool() + +def convertBool(boolean): + return QVariant(boolean) + +def getBoolDict(qvariant): + dict_str_bool = {} + try: + for key, value in qvariant.toPyObject().items(): + dict_str_bool[unicode(key)] = value + except: + pass + return dict_str_bool + +def convertBoolDict(dict_str_bool): + return QVariant(dict_str_bool) + +def getDict(qvariant): + dict_str_variant = {} + try: + for key, value in qvariant.toMap().items(): + dict_str_variant[unicode(key)] = value + except: + pass + return dict_str_variant + +def convertDict(dict_str_variant): + result_dict = {} + for key, value in dict_str_variant.items(): + result_dict[QString(key)] = QVariant(value) + return QVariant(result_dict) diff --git a/wizard/qvariant_converter_new.py b/wizard/qvariant_converter_new.py deleted file mode 100644 index fc7c93cd..00000000 --- a/wizard/qvariant_converter_new.py +++ /dev/null @@ -1,92 +0,0 @@ -#!/usr/bin/env python -# encoding: utf-8 -# -# 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 -# - -from PyQt4.QtCore import * - -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) diff --git a/wizard/qvariant_converter_newer.py b/wizard/qvariant_converter_newer.py deleted file mode 100644 index 597d01ce..00000000 --- a/wizard/qvariant_converter_newer.py +++ /dev/null @@ -1,105 +0,0 @@ -#!/usr/bin/env python -# encoding: utf-8 -# -# This file is part of slimqc. -# -# Slimqc 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 2009 Develer S.r.l. (http://www.develer.com/) -# -# $Id$ -# -# Author: Lorenzo Berni -# - -from PyQt4.QtCore import * - -def getString(qvariant): - if type(qvariant) != QVariant: - return qvariant - string = unicode(qvariant.toString()) - return string - -def convertString(string): - return QVariant(string) - -def getStringList(qvariant): - if type(qvariant) != QVariant: - return 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 = {} - try: - for key, value in qvariant.toPyObject().items(): - dict_str_str[unicode(key)] = unicode(value) - except: - pass - 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 = {} - try: - for key, value in qvariant.toPyObject().items(): - dict_str_bool[unicode(key)] = value.toBool() - except: - pass - return dict_str_bool - -def convertBoolDict(dict_str_bool): - result_dict = {} - for key, value in dict_str_bool.items(): - result_dict[QString(key)] = QVariant(value) - return QVariant(result_dict) - -def getDict(qvariant): - dict_str_variant = {} - try: - for key, value in qvariant.toPyObject().items(): - dict_str_variant[unicode(key)] = value - except: - pass - 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) diff --git a/wizard/qvariant_converter_newest.py b/wizard/qvariant_converter_newest.py deleted file mode 100644 index f31bb92d..00000000 --- a/wizard/qvariant_converter_newest.py +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/env python -# encoding: utf-8 -# -# This file is part of slimqc. -# -# Slimqc 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 2009 Develer S.r.l. (http://www.develer.com/) -# -# $Id$ -# -# Author: Lorenzo Berni -# - -from PyQt4.QtCore import * - -def getString(qvariant): - if type(qvariant) != QVariant: - return qvariant - string = unicode(qvariant.toString()) - return string - -def convertString(string): - return QVariant(string) - -def getStringList(qvariant): - if type(qvariant) == QVariant: - tmp = qvariant.toPyObject() - else: - tmp = qvariant - string_list = [] - if tmp: - string_list = [unicode(string) for string in tmp] - return string_list - -def convertStringList(string_list): - return QVariant(string_list) - -def getStringDict(qvariant): - dict_str_str = {} - try: - for key, value in qvariant.toPyObject().items(): - dict_str_str[unicode(key)] = unicode(value) - except: - pass - return dict_str_str - -def convertStringDict(string_dict): - return QVariant(string_dict) - -def getBool(qvariant): - return qvariant.toBool() - -def convertBool(boolean): - return QVariant(boolean) - -def getBoolDict(qvariant): - dict_str_bool = {} - try: - for key, value in qvariant.toPyObject().items(): - dict_str_bool[unicode(key)] = value - except: - pass - return dict_str_bool - -def convertBoolDict(dict_str_bool): - return QVariant(dict_str_bool) - -def getDict(qvariant): - dict_str_variant = {} - try: - for key, value in qvariant.toMap().items(): - dict_str_variant[unicode(key)] = value - except: - pass - return dict_str_variant - -def convertDict(dict_str_variant): - result_dict = {} - for key, value in dict_str_variant.items(): - result_dict[QString(key)] = QVariant(value) - return QVariant(result_dict)