From e78792932d60bc0516fdd67263a609d571c119f7 Mon Sep 17 00:00:00 2001 From: Marcelo Lira Date: Thu, 5 Nov 2009 11:33:36 -0300 Subject: [PATCH] fixed Converter::isConvertible() method to consider all the cases; also changed Converter::toCpp last return option to use a more straightforward way to get the C++ object --- PySide/QtCore/qstring_conversions.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/PySide/QtCore/qstring_conversions.h b/PySide/QtCore/qstring_conversions.h index 3f2766a..e67bed1 100644 --- a/PySide/QtCore/qstring_conversions.h +++ b/PySide/QtCore/qstring_conversions.h @@ -1,6 +1,10 @@ inline bool Converter< QString >::isConvertible(PyObject* pyobj) { - return PyUnicode_Check(pyobj) || PyString_Check(pyobj); + return PyString_Check(pyobj) + || PyUnicode_Check(pyobj) + || PyQByteArray_Check(pyobj) + || PyQLatin1String_Check(pyobj) + || PyQChar_Check(pyobj); } inline PyObject* Converter< QString >::createWrapper(const QString* cppobj) @@ -35,5 +39,5 @@ inline QString Converter< QString >::toCpp(PyObject* pyobj) #endif } else if (PyString_Check(pyobj)) return QString(Converter< char * >::toCpp(pyobj)); - return *Converter< QString* >::toCpp(pyobj); + return *PyQString_cptr(pyobj); }