diff options
author | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-02-24 15:19:36 -0300 |
---|---|---|
committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-02-24 15:41:05 -0300 |
commit | eeb50b166bc122cf5326e842528d92b4e0914ff3 (patch) | |
tree | 797549e264741ef8608f9ccdea3f262ea43eea96 /PySide/QtCore/glue | |
parent | 15cfd5f5a2da879f0ac4a1f5dfd4f2fb139ac6b4 (diff) |
Custom code should use Converters instead of the "_cptr" macros.
Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Diffstat (limited to 'PySide/QtCore/glue')
-rw-r--r-- | PySide/QtCore/glue/qbytearray_bufferprotocol.cpp | 2 | ||||
-rw-r--r-- | PySide/QtCore/glue/qobject_connect.cpp | 4 | ||||
-rw-r--r-- | PySide/QtCore/glue/qstring_bufferprotocol.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp b/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp index f0d15048e..4fd158789 100644 --- a/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp +++ b/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp @@ -18,7 +18,7 @@ static Py_ssize_t SbkQByteArray_readbufferproc(PyObject* self, Py_ssize_t segmen if (segment || Shiboken::cppObjectIsInvalid(self)) return -1; - QByteArray* cppSelf = SbkQByteArray_cptr(self); + QByteArray* cppSelf = Converter<QByteArray*>::toCpp(self); *ptrptr = reinterpret_cast<void*>(cppSelf->data()); return cppSelf->size(); } diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp index 1b28ee0a8..b813be9a6 100644 --- a/PySide/QtCore/glue/qobject_connect.cpp +++ b/PySide/QtCore/glue/qobject_connect.cpp @@ -3,11 +3,11 @@ static bool getReceiver(PyObject *callback, QObject **receiver, PyObject **self) if (PyMethod_Check(callback)) { *self = PyMethod_GET_SELF(callback); if (SbkQObject_Check(*self)) - *receiver = SbkQObject_cptr(*self); + *receiver = Converter<QObject*>::toCpp(*self); } else if (PyCFunction_Check(callback)) { *self = PyCFunction_GET_SELF(callback); if (*self && SbkQObject_Check(*self)) - *receiver = SbkQObject_cptr(*self); + *receiver = Converter<QObject*>::toCpp(*self); } else if (!PyFunction_Check(callback)) { *receiver = 0; *self = 0; diff --git a/PySide/QtCore/glue/qstring_bufferprotocol.cpp b/PySide/QtCore/glue/qstring_bufferprotocol.cpp index 9e7fb2cf1..02ca32c6f 100644 --- a/PySide/QtCore/glue/qstring_bufferprotocol.cpp +++ b/PySide/QtCore/glue/qstring_bufferprotocol.cpp @@ -18,7 +18,7 @@ static Py_ssize_t SbkQString_readbufferproc(PyObject* self, Py_ssize_t segment, if (segment || Shiboken::cppObjectIsInvalid(self)) return -1; - QString* cppSelf = SbkQString_cptr(self); + QString* cppSelf = Converter<QString*>::toCpp(self); QByteArray decodedData = cppSelf->toLocal8Bit(); Shiboken::AutoDecRef decodedString(PyString_FromStringAndSize(decodedData.constData(), decodedData.size())); |