From 702cd168e1af7ef854aad7091529e4ce6e9df833 Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Thu, 3 Feb 2011 18:04:16 -0200
Subject: Fix comparisson of QByteArray with Python strings that have zeroes
 inside.

---
 PySide/QtCore/qbytearray_conversions.h | 34 ++++++++++++++++++++++++++++++++++
 PySide/QtCore/typesystem_core.xml      | 14 ++++++++++++++
 tests/QtCore/qbytearray_test.py        |  1 +
 3 files changed, 49 insertions(+)
 create mode 100644 PySide/QtCore/qbytearray_conversions.h

diff --git a/PySide/QtCore/qbytearray_conversions.h b/PySide/QtCore/qbytearray_conversions.h
new file mode 100644
index 000000000..daa16099f
--- /dev/null
+++ b/PySide/QtCore/qbytearray_conversions.h
@@ -0,0 +1,34 @@
+namespace Shiboken {
+
+inline bool Converter<QByteArray>::checkType(PyObject* pyObj)
+{
+    return ValueTypeConverter<QByteArray>::checkType(pyObj);
+}
+
+inline bool Converter<QByteArray>::isConvertible(PyObject* pyObj)
+{
+    if (ValueTypeConverter<QByteArray>::isConvertible(pyObj))
+        return true;
+    SbkObjectType* shiboType = reinterpret_cast<SbkObjectType*>(SbkType< ::QByteArray >());
+    return Shiboken::Converter<const char *>::checkType(pyObj)
+        || (ObjectType::isExternalConvertible(shiboType, pyObj));
+}
+
+inline QByteArray Converter<QByteArray>::toCpp(PyObject* pyObj)
+{
+    if (pyObj == Py_None)
+        return 0;
+    else if (PyObject_TypeCheck(pyObj, SbkType<QByteArray>()))
+        return *Converter<QByteArray*>::toCpp(pyObj);
+    else if (PyString_Check(pyObj))
+        return QByteArray(PyString_AS_STRING(pyObj), PyString_GET_SIZE(pyObj));
+    else
+        return ValueTypeConverter<QByteArray>::toCpp(pyObj);
+}
+
+inline PyObject* Converter<QByteArray>::toPython(const ::QByteArray& cppObj)
+{
+    return ValueTypeConverter<QByteArray>::toPython(cppObj);
+}
+
+}
diff --git a/PySide/QtCore/typesystem_core.xml b/PySide/QtCore/typesystem_core.xml
index 4979b566a..beac5175f 100644
--- a/PySide/QtCore/typesystem_core.xml
+++ b/PySide/QtCore/typesystem_core.xml
@@ -1442,6 +1442,8 @@
     </add-function>
   </value-type>
   <value-type name="QByteArray" hash-function="qHash">
+    <conversion-rule file="qbytearray_conversions.h"/>
+
     <extra-includes>
       <include file-name="QNoImplicitBoolCast" location="global"/>
     </extra-includes>
@@ -1499,6 +1501,18 @@
     <modify-function signature="operator const char *()const" remove="all"/>
     <modify-function signature="operator const void *()const" remove="all"/>
     <modify-function signature="operator+=(const char*)" remove="all"/>
+    <modify-function signature="operator==(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator==(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator!=(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator!=(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator&lt;(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator&lt;(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator&lt;=(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator&lt;=(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator>(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator>(QByteArray,const char*)" remove="all" />
+    <modify-function signature="operator>=(const char*,QByteArray)" remove="all" />
+    <modify-function signature="operator>=(QByteArray,const char*)" remove="all" />
     <modify-function signature="operator[](int)const" remove="all"/>
     <modify-function signature="operator[](uint)const" remove="all"/>
     <modify-function signature="push_back(char)" remove="all"/>
diff --git a/tests/QtCore/qbytearray_test.py b/tests/QtCore/qbytearray_test.py
index f031332d9..396545f4e 100644
--- a/tests/QtCore/qbytearray_test.py
+++ b/tests/QtCore/qbytearray_test.py
@@ -49,6 +49,7 @@ class QByteArrayData(unittest.TestCase):
         ba = QByteArray(s1)
         s2 = ba.data()
         self.assertEqual(s1, s2)
+        self.assertEqual(s1, ba)
 
 class QByteArrayOperatorAtSetter(unittest.TestCase):
     '''Test case for operator QByteArray[] - __setitem__'''
-- 
cgit v1.2.3