diff options
author | Marcelo Lira <marcelo.lira@openbossa.org> | 2009-10-28 17:54:22 -0300 |
---|---|---|
committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2009-10-30 14:02:33 -0300 |
commit | 9c0e56b59893041f0c56928d258bc2f85c917b30 (patch) | |
tree | e2703254d192dc25edc3b0ae9ab3c55be318a0b0 /PySide/QtCore/qstring_conversions.h | |
parent | 7c0aea7c45ae79907c3d50e57e7f6094a43abed0 (diff) |
updated custom conversions to use Converter<T>::isConvertible properly
Diffstat (limited to 'PySide/QtCore/qstring_conversions.h')
-rw-r--r-- | PySide/QtCore/qstring_conversions.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/PySide/QtCore/qstring_conversions.h b/PySide/QtCore/qstring_conversions.h index 760800038..a9a11ba28 100644 --- a/PySide/QtCore/qstring_conversions.h +++ b/PySide/QtCore/qstring_conversions.h @@ -1,9 +1,9 @@ -inline bool Converter< QString >::isConvertible(const PyObject* pyObj) +inline bool Converter< QString >::isConvertible(PyObject* pyObj) { return PyObject_TypeCheck(pyObj, &PyQString_Type) || PyUnicode_Check(pyObj) || PyString_Check(pyObj); } -inline PyObject* Converter< QString >::toPython(const QString cppobj) +inline PyObject* Converter< QString >::toPython(QString cppobj) { PyObject* pyobj; void* holder = (void*) new QString(cppobj); @@ -13,11 +13,11 @@ inline PyObject* Converter< QString >::toPython(const QString cppobj) inline QString Converter< QString >::toCpp(PyObject* pyobj) { - if (Converter<QChar>::isConvertible(pyobj)) { + if (PyQChar_Check(pyobj)) { return QString(Converter< QChar >::toCpp(pyobj)); - } else if (Converter<QByteArray>::isConvertible(pyobj)) { + } else if (PyQByteArray_Check(pyobj)) { return QString(Converter< QByteArray >::toCpp(pyobj)); - } else if (Converter<QLatin1String>::isConvertible(pyobj)) { + } else if (PyQLatin1String_Check(pyobj)) { return QString(Converter< QLatin1String >::toCpp(pyobj)); } else if (PyUnicode_Check(pyobj)) { #if defined(Py_UNICODE_WIDE) |