From 5c0d39b9dc18450364399f68ba0db3b19a9605c8 Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Wed, 1 Sep 2010 15:06:17 -0300
Subject: Fix bug#316 - "QAbstractItemModel.createIndex is broken"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Renato Araújo <renato.filho@openbossa.org>
---
 PySide/QtCore/glue/qobject_connect.cpp | 4 ++--
 PySide/QtCore/qstring_conversions.h    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'PySide')

diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp
index 8578bffc2..b140374ec 100644
--- a/PySide/QtCore/glue/qobject_connect.cpp
+++ b/PySide/QtCore/glue/qobject_connect.cpp
@@ -2,11 +2,11 @@ static bool getReceiver(PyObject *callback, QObject **receiver, PyObject **self)
 {
     if (PyMethod_Check(callback)) {
         *self = PyMethod_GET_SELF(callback);
-        if (SbkQObject_Check(*self))
+        if (Shiboken::Converter<QObject*>::checkType(*self))
             *receiver = Converter<QObject*>::toCpp(*self);
     } else if (PyCFunction_Check(callback)) {
         *self = PyCFunction_GET_SELF(callback);
-        if (*self && SbkQObject_Check(*self))
+        if (*self && Shiboken::Converter<QObject*>::checkType(*self))
             *receiver = Converter<QObject*>::toCpp(*self);
     } else if (PyCallable_Check(callback)) {
         // Ok, just a callable object
diff --git a/PySide/QtCore/qstring_conversions.h b/PySide/QtCore/qstring_conversions.h
index d0006b889..670c01f90 100644
--- a/PySide/QtCore/qstring_conversions.h
+++ b/PySide/QtCore/qstring_conversions.h
@@ -18,7 +18,7 @@ struct Converter<QString>
     {
         return PyString_Check(pyObj)
                 || PyUnicode_Check(pyObj)
-                || SbkQByteArray_Check(pyObj)
+                || Converter<QByteArray>::checkType(pyObj)
                 || pyObj == Py_None
     #if PY_VERSION_HEX < 0x03000000
                 || (pyObj->ob_type->tp_as_buffer
@@ -42,7 +42,7 @@ struct Converter<QString>
             return QString(Converter< char * >::toCpp(pyObj));
         } else if (pyObj == Py_None) {
             return QString();
-        } else if (SbkQByteArray_Check(pyObj)) {
+        } else if (Converter<QByteArray>::checkType(pyObj)) {
             return QString(Converter< QByteArray >::toCpp(pyObj));
         }
 #if PY_VERSION_HEX < 0x03000000
-- 
cgit v1.2.3