diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-06-15 16:12:26 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:29 -0300 |
| commit | af2972255d9977541b6cd40521ea9a387f24b452 (patch) | |
| tree | 1c77ed3eefa519a0d7891a9cd6770d2dbb6b11c6 | |
| parent | df30f375124a1faea6a960e6adcd0d90fba08615 (diff) | |
Updated PySide type systems to use the new type system variables: %ISCONVERTIBLE and %CHECKTYPE.
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Reviewed by Renato Araujo <renato.filho@openbossa.org>
| -rw-r--r-- | PySide/QtCore/typesystem_core.xml | 2 | ||||
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml index 6de9e4556..704306115 100644 --- a/PySide/QtCore/typesystem_core.xml +++ b/PySide/QtCore/typesystem_core.xml @@ -2118,7 +2118,7 @@ Shiboken::AutoDecRef fileNo(PyObject_GetAttrString(%PYARG_1, "fileno")); if (!fileNo.isNull()) { Shiboken::AutoDecRef fileNoValue(PyObject_CallObject(fileNo, 0)); - if (Shiboken::Converter<int>::checkType(fileNoValue)) + if (%CHECKTYPE[int](fileNoValue)) %0 = new %TYPE(%CONVERTTOCPP[int](fileNoValue), %2, %3); } </inject-code> diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 602fcf000..815bf734f 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -2715,14 +2715,14 @@ int size = PySequence_Fast_GET_SIZE(seq.object()); if (size > 1) { - if (Shiboken::Converter<QString>::isConvertible(PySequence_Fast_GET_ITEM(seq.object(), 1))) + if (%ISCONVERTIBLE[QString](PySequence_Fast_GET_ITEM(seq.object(), 1))) %1 = %CONVERTTOCPP[QString](PySequence_Fast_GET_ITEM(seq.object(), 1)); else qWarning("%TYPE::%FUNCTION_NAME: Second tuple element is not convertible to unicode."); } if (size > 2) { - if (Shiboken::Converter<int>::isConvertible(PySequence_Fast_GET_ITEM(seq.object(), 2))) + if (%ISCONVERTIBLE[int](PySequence_Fast_GET_ITEM(seq.object(), 2))) %2 = %CONVERTTOCPP[int](PySequence_Fast_GET_ITEM(seq.object(), 2)); else qWarning("%TYPE::%FUNCTION_NAME: Second tuple element is not convertible to int."); @@ -2732,7 +2732,7 @@ } // check retrun value - if (Shiboken::Converter<QValidator::State>::isConvertible(%PYARG_0)) { + if (%ISCONVERTIBLE[QValidator::State](%PYARG_0)) { %out = %CONVERTTOCPP[QValidator::State](%PYARG_0); } else { PyErr_Format(PyExc_TypeError, "Invalid return value in function %s, expected %s, got %s.", |