diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2009-12-08 14:38:52 -0300 |
|---|---|---|
| committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2009-12-08 14:38:52 -0300 |
| commit | b9ca1774f78c3dbd287b28138aaea6907f839918 (patch) | |
| tree | f5dbe4c3be222b63cf0d7cf0359877592b76d85f /PySide/QtCore/qstring_conversions.h | |
| parent | 42526f3202e13245a07b15f9f25657dda124da19 (diff) | |
Updated code injections to use Shiboken updates regarding type system variables.
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'PySide/QtCore/qstring_conversions.h')
| -rw-r--r-- | PySide/QtCore/qstring_conversions.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/PySide/QtCore/qstring_conversions.h b/PySide/QtCore/qstring_conversions.h index 0d4cc6beb..3265736fc 100644 --- a/PySide/QtCore/qstring_conversions.h +++ b/PySide/QtCore/qstring_conversions.h @@ -2,9 +2,9 @@ inline bool Converter< QString >::isConvertible(PyObject* pyobj) { return PyString_Check(pyobj) || PyUnicode_Check(pyobj) - || PyQByteArray_Check(pyobj) - || PyQLatin1String_Check(pyobj) - || PyQChar_Check(pyobj); + || SbkQByteArray_Check(pyobj) + || SbkQLatin1String_Check(pyobj) + || SbkQChar_Check(pyobj); } inline QString* Converter<QString >::copyCppObject(const QString& cppobj) @@ -19,11 +19,11 @@ inline PyObject* Converter< QString >::toPython(const QString& cppobj) inline QString Converter< QString >::toCpp(PyObject* pyobj) { - if (PyQChar_Check(pyobj)) { + if (SbkQChar_Check(pyobj)) { return QString(Converter< QChar >::toCpp(pyobj)); - } else if (PyQByteArray_Check(pyobj)) { + } else if (SbkQByteArray_Check(pyobj)) { return QString(Converter< QByteArray >::toCpp(pyobj)); - } else if (PyQLatin1String_Check(pyobj)) { + } else if (SbkQLatin1String_Check(pyobj)) { return QString(Converter< QLatin1String >::toCpp(pyobj)); } else if (PyUnicode_Check(pyobj)) { Py_UNICODE* unicode = PyUnicode_AS_UNICODE(pyobj); @@ -34,5 +34,5 @@ inline QString Converter< QString >::toCpp(PyObject* pyobj) #endif } else if (PyString_Check(pyobj)) return QString(Converter< char * >::toCpp(pyobj)); - return *PyQString_cptr(pyobj); + return *SbkQString_cptr(pyobj); } |