diff options
author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-23 15:04:27 -0200 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-11-23 15:04:27 -0200 |
commit | f31d9107555376e60757b9c8054030e2cf7bddad (patch) | |
tree | 9507ec8beeaf12ac46210c89e4827104a33f0cbe /PySide/QtCore/glue/qbytearray_bufferprotocol.cpp | |
parent | e635023cdb91452e719f16afb70d3d19b01aed34 (diff) | |
parent | a8ae0680f23ca5e702a662cf36a465b7a7b2788a (diff) |
Merge branch 'apichanges'
Reviewer: Renato Araújo <renato.filho@openbossa.org>
Luciano Wolf <luciano.wolf@openbossa.org>
Conflicts:
libpyside/pyside.cpp
Diffstat (limited to 'PySide/QtCore/glue/qbytearray_bufferprotocol.cpp')
-rw-r--r-- | PySide/QtCore/glue/qbytearray_bufferprotocol.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp b/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp index 19ee4e7b6..03ffcb4af 100644 --- a/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp +++ b/PySide/QtCore/glue/qbytearray_bufferprotocol.cpp @@ -15,10 +15,10 @@ static Py_ssize_t SbkQByteArray_segcountproc(PyObject* self, Py_ssize_t* lenp) static Py_ssize_t SbkQByteArray_readbufferproc(PyObject* self, Py_ssize_t segment, void** ptrptr) { - if (segment || !Shiboken::Wrapper::isValid(self)) + if (segment || !Shiboken::Object::isValid(self)) return -1; - QByteArray* cppSelf = Converter<QByteArray*>::toCpp(self); + QByteArray* cppSelf = Shiboken::Converter<QByteArray*>::toCpp(self); *ptrptr = reinterpret_cast<void*>(cppSelf->data()); return cppSelf->size(); } |