diff options
Diffstat (limited to 'sources/pyside6')
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtcore.cpp | 8 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtstatemachine.cpp | 5 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/templates/opengl_common.xml | 2 | ||||
| -rw-r--r-- | sources/pyside6/libpyside/signalmanager.cpp | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/sources/pyside6/PySide6/glue/qtcore.cpp b/sources/pyside6/PySide6/glue/qtcore.cpp index 2cbc3c11a..2b5729a69 100644 --- a/sources/pyside6/PySide6/glue/qtcore.cpp +++ b/sources/pyside6/PySide6/glue/qtcore.cpp @@ -1549,11 +1549,11 @@ QString &res = *%0; // @snippet return-readData %RETURN_TYPE %0 = 0; if (PyBytes_Check(%PYARG_0)) { - %0 = PyBytes_GET_SIZE((PyObject *)%PYARG_0); - memcpy(%1, PyBytes_AS_STRING((PyObject *)%PYARG_0), %0); + %0 = PyBytes_GET_SIZE(%PYARG_0); + memcpy(%1, PyBytes_AS_STRING(%PYARG_0), %0); } else if (Shiboken::String::check(%PYARG_0)) { - %0 = Shiboken::String::len((PyObject *)%PYARG_0); - memcpy(%1, Shiboken::String::toCString((PyObject *)%PYARG_0), %0); + %0 = Shiboken::String::len(%PYARG_0); + memcpy(%1, Shiboken::String::toCString(%PYARG_0), %0); } // @snippet return-readData diff --git a/sources/pyside6/PySide6/glue/qtstatemachine.cpp b/sources/pyside6/PySide6/glue/qtstatemachine.cpp index 8a00bd3fd..16b096b5d 100644 --- a/sources/pyside6/PySide6/glue/qtstatemachine.cpp +++ b/sources/pyside6/PySide6/glue/qtstatemachine.cpp @@ -43,12 +43,13 @@ // @snippet qsignaltransition if (PyObject_TypeCheck(%1, PySideSignalInstanceTypeF())) { - PyObject *dataSource = PySide::Signal::getObject((PySideSignalInstance *)%PYARG_1); + auto *signalInstance = reinterpret_cast<PySideSignalInstance *>(%PYARG_1); + PyObject *dataSource = PySide::Signal::getObject(signalInstance); Shiboken::AutoDecRef obType(PyObject_Type(dataSource)); QObject * sender = %CONVERTTOCPP[QObject *](dataSource); //XXX /|\ omitting this space crashes shiboken! if (sender) { - const char *dataSignature = PySide::Signal::getSignature((PySideSignalInstance *)%PYARG_1); + const char *dataSignature = PySide::Signal::getSignature(signalInstance); QByteArray signature(dataSignature); // Append SIGNAL flag (2) signature.prepend('2'); %0 = new QSignalTransitionWrapper(sender, signature, %2); diff --git a/sources/pyside6/PySide6/templates/opengl_common.xml b/sources/pyside6/PySide6/templates/opengl_common.xml index e4e15e770..8160a13ba 100644 --- a/sources/pyside6/PySide6/templates/opengl_common.xml +++ b/sources/pyside6/PySide6/templates/opengl_common.xml @@ -55,7 +55,7 @@ %CPPSELF.%FUNCTION_NAME(%1, _list, $ARG0); delete[] _list; } else { - %CPPSELF.%FUNCTION_NAME(%1, ($ATTR_TYPE*)nullptr, $ARG1); + %CPPSELF.%FUNCTION_NAME(%1, reinterpret_cast<$ATTR_TYPE*>(nullptr), $ARG1); } </template> <template name="glGetString_return_QString"> diff --git a/sources/pyside6/libpyside/signalmanager.cpp b/sources/pyside6/libpyside/signalmanager.cpp index 87726facb..26f80dff4 100644 --- a/sources/pyside6/libpyside/signalmanager.cpp +++ b/sources/pyside6/libpyside/signalmanager.cpp @@ -165,7 +165,8 @@ QDataStream &operator<<(QDataStream &out, const PyObjectWrapper &myObj) Shiboken::AutoDecRef pickleModule(PyImport_ImportModule("pickle")); reduce_func = PyObject_GetAttr(pickleModule, Shiboken::PyName::dumps()); } - Shiboken::AutoDecRef repr(PyObject_CallFunctionObjArgs(reduce_func, (PyObject *)myObj, NULL)); + PyObject *pyObj = myObj; + Shiboken::AutoDecRef repr(PyObject_CallFunctionObjArgs(reduce_func, pyObj, nullptr)); if (repr.object()) { const char *buff = nullptr; Py_ssize_t size = 0; |