diff options
Diffstat (limited to 'sources/pyside6/PySide6/glue')
| -rw-r--r-- | sources/pyside6/PySide6/glue/qhttpserver.cpp | 6 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtcore.cpp | 38 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtgui.cpp | 30 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtnetwork.cpp | 10 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtnetworkauth.cpp | 4 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtquick3d.cpp | 4 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtserialbus.cpp | 12 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtuitools.cpp | 4 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtwebenginecore.cpp | 14 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtwidgets.cpp | 22 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/glue/qtxml.cpp | 8 |
11 files changed, 76 insertions, 76 deletions
diff --git a/sources/pyside6/PySide6/glue/qhttpserver.cpp b/sources/pyside6/PySide6/glue/qhttpserver.cpp index c3afafb95..dd08a38af 100644 --- a/sources/pyside6/PySide6/glue/qhttpserver.cpp +++ b/sources/pyside6/PySide6/glue/qhttpserver.cpp @@ -15,7 +15,7 @@ bool cppResult = %CPPSELF.%FUNCTION_NAME(rule, Shiboken::GilState state; auto *requestPtr = &request; Shiboken::AutoDecRef arglist(PyTuple_New(1)); - PyTuple_SET_ITEM(arglist, 0, + PyTuple_SetItem(arglist, 0, %CONVERTTOPYTHON[QHttpServerRequest *](requestPtr)); PyObject *ret = PyObject_CallObject(callable, arglist); if (PyErr_Occurred()) @@ -38,9 +38,9 @@ auto callback = [callable](const QHttpServerRequest &request, Shiboken::AutoDecRef arglist(PyTuple_New(2)); auto *responsePtr = &response; auto *requestPtr = &request; - PyTuple_SET_ITEM(arglist, 0, + PyTuple_SetItem(arglist, 0, %CONVERTTOPYTHON[QHttpServerRequest *](requestPtr)); - PyTuple_SET_ITEM(arglist, 1, + PyTuple_SetItem(arglist, 1, %CONVERTTOPYTHON[QHttpServerResponse *](responsePtr)); PyObject_CallObject(callable, arglist); if (PyErr_Occurred()) diff --git a/sources/pyside6/PySide6/glue/qtcore.cpp b/sources/pyside6/PySide6/glue/qtcore.cpp index 0c113aed8..6734f3bfb 100644 --- a/sources/pyside6/PySide6/glue/qtcore.cpp +++ b/sources/pyside6/PySide6/glue/qtcore.cpp @@ -322,7 +322,7 @@ QByteArray uncompressed = %FUNCTION_NAME(ptr, %2); QList<QByteArray> version = QByteArray(qVersion()).split('.'); PyObject *pyQtVersion = PyTuple_New(3); for (int i = 0; i < 3; ++i) - PyTuple_SET_ITEM(pyQtVersion, i, PyLong_FromLong(version[i].toInt())); + PyTuple_SetItem(pyQtVersion, i, PyLong_FromLong(version[i].toInt())); PyModule_AddObject(module, "__version_info__", pyQtVersion); PyModule_AddStringConstant(module, "__version__", qVersion()); // @snippet qt-version @@ -434,11 +434,11 @@ static void msgHandlerCallback(QtMsgType type, const QMessageLogContext &ctx, co { Shiboken::GilState state; Shiboken::AutoDecRef arglist(PyTuple_New(3)); - PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QtMsgType](type)); - PyTuple_SET_ITEM(arglist, 1, %CONVERTTOPYTHON[QMessageLogContext &](ctx)); + PyTuple_SetItem(arglist, 0, %CONVERTTOPYTHON[QtMsgType](type)); + PyTuple_SetItem(arglist, 1, %CONVERTTOPYTHON[QMessageLogContext &](ctx)); QByteArray array = msg.toUtf8(); // Python handler requires UTF-8 const char *data = array.constData(); - PyTuple_SET_ITEM(arglist, 2, %CONVERTTOPYTHON[const char *](data)); + PyTuple_SetItem(arglist, 2, %CONVERTTOPYTHON[const char *](data)); Shiboken::AutoDecRef ret(PyObject_CallObject(qtmsghandler, arglist)); } // @snippet qt-messagehandler @@ -474,8 +474,8 @@ namespace PySide { QPointF p; %RETURN_TYPE retval = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &p); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QPointF](p)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QPointF](p)); // @snippet qlinef-intersect // @snippet qresource-data @@ -498,17 +498,17 @@ if (!PyDateTimeAPI) int year, month, day; %CPPSELF.%FUNCTION_NAME(&year, &month, &day); %PYARG_0 = PyTuple_New(3); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](year)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](month)); -PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](day)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[int](year)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[int](month)); +PyTuple_SetItem(%PYARG_0, 2, %CONVERTTOPYTHON[int](day)); // @snippet qdate-getdate // @snippet qdate-weeknumber int yearNumber; int week = %CPPSELF.%FUNCTION_NAME(&yearNumber); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](week)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](yearNumber)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[int](week)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[int](yearNumber)); // @snippet qdate-weeknumber // @snippet qdatetime-1 @@ -1136,8 +1136,8 @@ if (msec == 0) { qint64 pid; %RETURN_TYPE retval = %TYPE::%FUNCTION_NAME(%1, %2, %3, &pid); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[qint64](pid)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[qint64](pid)); // @snippet qprocess-startdetached // @snippet qcoreapplication-init @@ -1145,7 +1145,7 @@ static void QCoreApplicationConstructor(PyObject *self, PyObject *pyargv, QCoreA { static int argc; static char **argv; - PyObject *stringlist = PyTuple_GET_ITEM(pyargv, 0); + PyObject *stringlist = PyTuple_GetItem(pyargv, 0); if (Shiboken::listToArgcArgv(stringlist, &argc, &argv, "PySideApp")) { *cptr = new QCoreApplicationWrapper(argc, argv); Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject *>(self)); @@ -1354,7 +1354,7 @@ Py_END_ALLOW_THREADS if (!atexit.isNull() && !regFunc.isNull()){ PyObject *shutDownFunc = PyObject_GetAttrString(module, "__moduleShutdown"); Shiboken::AutoDecRef args(PyTuple_New(1)); - PyTuple_SET_ITEM(args, 0, shutDownFunc); + PyTuple_SetItem(args, 0, shutDownFunc); Shiboken::AutoDecRef retval(PyObject_Call(regFunc, args, nullptr)); Q_ASSERT(!retval.isNull()); } @@ -2079,7 +2079,7 @@ auto callback = [callable, arg_qpermission](const QPermission &permission) -> vo Shiboken::GilState state; if (arg_qpermission) { Shiboken::AutoDecRef arglist(PyTuple_New(1)); - PyTuple_SET_ITEM(arglist.object(), 0, %CONVERTTOPYTHON[QPermission](permission)); + PyTuple_SetItem(arglist.object(), 0, %CONVERTTOPYTHON[QPermission](permission)); Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist)); } else { Shiboken::AutoDecRef ret(PyObject_CallObject(callable, nullptr)); @@ -2098,9 +2098,9 @@ qint64 pid{}; QString hostname, appname; %CPPSELF.%FUNCTION_NAME(&pid, &hostname, &appname); %PYARG_0 = PyTuple_New(3); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[qint64](pid)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](hostname)); -PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[QString](appname)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[qint64](pid)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QString](hostname)); +PyTuple_SetItem(%PYARG_0, 2, %CONVERTTOPYTHON[QString](appname)); // @snippet qlockfile-getlockinfo // @snippet darwin_permission_plugin diff --git a/sources/pyside6/PySide6/glue/qtgui.cpp b/sources/pyside6/PySide6/glue/qtgui.cpp index 0c6c4961c..d248ef2d3 100644 --- a/sources/pyside6/PySide6/glue/qtgui.cpp +++ b/sources/pyside6/PySide6/glue/qtgui.cpp @@ -84,8 +84,8 @@ QAccessibleInterface *PySideAccessibleFactory::callFactories(const QString &key, { Shiboken::GilState state; Shiboken::AutoDecRef arglist(PyTuple_New(2)); - PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](key)); - PyTuple_SET_ITEM(arglist, 1, %CONVERTTOPYTHON[QObject *](o)); + PyTuple_SetItem(arglist, 0, %CONVERTTOPYTHON[QString](key)); + PyTuple_SetItem(arglist, 1, %CONVERTTOPYTHON[QObject *](o)); for (auto *f : m_factoryFunctions) { if (PyObject *pyResult = PyObject_CallObject(f, arglist)) { @@ -305,8 +305,8 @@ QBitmap %0 = QBitmap::fromData(%1, buffer, %3); // @snippet qtextline-cursortox %RETURN_TYPE %0 = %CPPSELF->::%TYPE::%FUNCTION_NAME(&%1, %2); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1)); // @snippet qtextline-cursortox // @snippet qkeysequence-getitem @@ -412,8 +412,8 @@ static void imageDecrefDataHandler(void *data) // @snippet qimage-scanline // @snippet qcolor-setstate -Shiboken::AutoDecRef func(PyObject_GetAttr(%PYSELF, PyTuple_GET_ITEM(%1, 0))); -PyObject *args = PyTuple_GET_ITEM(%1, 1); +Shiboken::AutoDecRef func(PyObject_GetAttr(%PYSELF, PyTuple_GetItem(%1, 0))); +PyObject *args = PyTuple_GetItem(%1, 1); %PYARG_0 = PyObject_Call(func, args, nullptr); // @snippet qcolor-setstate @@ -688,8 +688,8 @@ for (int r=0, r_max = %CPPSELF.rowCount(); r < r_max; r++) { %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2); %END_ALLOW_THREADS %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1)); // @snippet qclipboard-text // @snippet qpainter-drawpointsnp-numpy-x-y @@ -733,7 +733,7 @@ float values[16]; %PYARG_0 = PyTuple_New(16); for (Py_ssize_t i = 0; i < 16; ++i) { PyObject *v = PyFloat_FromDouble(values[i]); - PyTuple_SET_ITEM(%PYARG_0, i, v); + PyTuple_SetItem(%PYARG_0, i, v); } // @snippet qmatrix4x4-copydatato @@ -758,7 +758,7 @@ static void QGuiApplicationConstructor(PyObject *self, PyObject *pyargv, QGuiApp { static int argc; static char **argv; - PyObject *stringlist = PyTuple_GET_ITEM(pyargv, 0); + PyObject *stringlist = PyTuple_GetItem(pyargv, 0); if (Shiboken::listToArgcArgv(stringlist, &argc, &argv, "PySideApp")) { *cptr = new QGuiApplicationWrapper(argc, argv, 0); Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject *>(self)); @@ -895,17 +895,17 @@ QVector3D outVec{}; float angle{}; %CPPSELF.%FUNCTION_NAME(&outVec, &angle); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[QVector3D](outVec)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[float](angle)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[QVector3D](outVec)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[float](angle)); // @snippet qquaternion-getaxisandangle-vector3d-float // @snippet qquaternion-geteulerangles float pitch{}, yaw{}, roll{}; %CPPSELF.%FUNCTION_NAME(&pitch, &yaw, &roll); %PYARG_0 = PyTuple_New(3); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[float](pitch)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[float](yaw)); -PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[float](roll)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[float](pitch)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[float](yaw)); +PyTuple_SetItem(%PYARG_0, 2, %CONVERTTOPYTHON[float](roll)); // @snippet qquaternion-geteulerangles // @snippet qregion-len diff --git a/sources/pyside6/PySide6/glue/qtnetwork.cpp b/sources/pyside6/PySide6/glue/qtnetwork.cpp index 07993f30a..7b1c2d564 100644 --- a/sources/pyside6/PySide6/glue/qtnetwork.cpp +++ b/sources/pyside6/PySide6/glue/qtnetwork.cpp @@ -10,9 +10,9 @@ quint16 port; %END_ALLOW_THREADS QByteArray ba(data, retval); %PYARG_0 = PyTuple_New(3); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[QByteArray](ba)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QHostAddress](ha)); -PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[quint16](port)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[QByteArray](ba)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QHostAddress](ha)); +PyTuple_SetItem(%PYARG_0, 2, %CONVERTTOPYTHON[quint16](port)); // @snippet qudpsocket-readdatagram // @snippet qhostinfo-lookuphost-functor @@ -29,7 +29,7 @@ void QHostInfoFunctor::operator()(const QHostInfo &hostInfo) Shiboken::GilState state; Shiboken::AutoDecRef arglist(PyTuple_New(1)); auto *pyHostInfo = %CONVERTTOPYTHON[QHostInfo](hostInfo); - PyTuple_SET_ITEM(arglist.object(), 0, pyHostInfo); + PyTuple_SetItem(arglist.object(), 0, pyHostInfo); Shiboken::AutoDecRef ret(PyObject_CallObject(object(), arglist)); release(); // single shot } @@ -89,7 +89,7 @@ void QRestFunctor::operator()(QRestReply &restReply) Shiboken::AutoDecRef arglist(PyTuple_New(1)); auto *restReplyPtr = &restReply; auto *pyRestReply = %CONVERTTOPYTHON[QRestReply*](restReplyPtr); - PyTuple_SET_ITEM(arglist.object(), 0, pyRestReply); + PyTuple_SetItem(arglist.object(), 0, pyRestReply); Shiboken::AutoDecRef ret(PyObject_CallObject(m_callable, arglist)); Py_DECREF(m_callable); m_callable = nullptr; diff --git a/sources/pyside6/PySide6/glue/qtnetworkauth.cpp b/sources/pyside6/PySide6/glue/qtnetworkauth.cpp index 7877a8dd5..1594c4add 100644 --- a/sources/pyside6/PySide6/glue/qtnetworkauth.cpp +++ b/sources/pyside6/PySide6/glue/qtnetworkauth.cpp @@ -21,8 +21,8 @@ void QAbstractOAuthModifyFunctor::operator()(QAbstractOAuth::Stage stage, Shiboken::GilState state; QMultiMap<QString, QVariant> dict = *dictPointer; Shiboken::AutoDecRef arglist(PyTuple_New(2)); - PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QAbstractOAuth::Stage](stage)); - PyTuple_SET_ITEM(arglist, 1, %CONVERTTOPYTHON[QMultiMap<QString, QVariant>](dict)); + PyTuple_SetItem(arglist, 0, %CONVERTTOPYTHON[QAbstractOAuth::Stage](stage)); + PyTuple_SetItem(arglist, 1, %CONVERTTOPYTHON[QMultiMap<QString, QVariant>](dict)); Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist)); if (!ret.isNull() && PyDict_Check(ret.object()) != 0) { diff --git a/sources/pyside6/PySide6/glue/qtquick3d.cpp b/sources/pyside6/PySide6/glue/qtquick3d.cpp index 0139913ad..eee286455 100644 --- a/sources/pyside6/PySide6/glue/qtquick3d.cpp +++ b/sources/pyside6/PySide6/glue/qtquick3d.cpp @@ -16,6 +16,6 @@ return resultPair.first; int count{}; %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&count); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](count)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[int](count)); // @snippet qquick3dinstancing-getinstancebuffer-return diff --git a/sources/pyside6/PySide6/glue/qtserialbus.cpp b/sources/pyside6/PySide6/glue/qtserialbus.cpp index cfff36056..0bf918fde 100644 --- a/sources/pyside6/PySide6/glue/qtserialbus.cpp +++ b/sources/pyside6/PySide6/glue/qtserialbus.cpp @@ -9,16 +9,16 @@ QString errorMessage; const QList<QCanBusDeviceInfo> result = %CPPSELF.%FUNCTION_NAME(&errorMessage); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[QList<QCanBusDeviceInfo>](result)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](errorMessage)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[QList<QCanBusDeviceInfo>](result)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QString](errorMessage)); // @snippet qcanbus-available-devices // @snippet qcanbus-available-devices-plugin QString errorMessage; const QList<QCanBusDeviceInfo> result = %CPPSELF.%FUNCTION_NAME(%1, &errorMessage); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[QList<QCanBusDeviceInfo>](result)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](errorMessage)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[QList<QCanBusDeviceInfo>](result)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QString](errorMessage)); // @snippet qcanbus-available-devices-plugin // @snippet qcanbus-createdevice @@ -33,6 +33,6 @@ if (auto *device = %CPPSELF.%FUNCTION_NAME(%1, %2, &errorMessage)) { Py_INCREF(pyDevice); } %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, pyDevice); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](errorMessage)); +PyTuple_SetItem(%PYARG_0, 0, pyDevice); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QString](errorMessage)); // @snippet qcanbus-createdevice diff --git a/sources/pyside6/PySide6/glue/qtuitools.cpp b/sources/pyside6/PySide6/glue/qtuitools.cpp index 1835ed096..3fe3554c4 100644 --- a/sources/pyside6/PySide6/glue/qtuitools.cpp +++ b/sources/pyside6/PySide6/glue/qtuitools.cpp @@ -207,6 +207,6 @@ if (%PYARG_0 == nullptr) { qCritical() << "Error while creating the return Tuple"; Py_RETURN_NONE; } -PyTuple_SET_ITEM(%PYARG_0, 0, classObj); -PyTuple_SET_ITEM(%PYARG_0, 1, baseClassObj); +PyTuple_SetItem(%PYARG_0, 0, classObj); +PyTuple_SetItem(%PYARG_0, 1, baseClassObj); // @snippet loaduitype diff --git a/sources/pyside6/PySide6/glue/qtwebenginecore.cpp b/sources/pyside6/PySide6/glue/qtwebenginecore.cpp index 9ce620bff..42ac6e768 100644 --- a/sources/pyside6/PySide6/glue/qtwebenginecore.cpp +++ b/sources/pyside6/PySide6/glue/qtwebenginecore.cpp @@ -14,7 +14,7 @@ bool QWebEngineCookieFilterFunctor::operator()(const QWebEngineCookieStore::Filt { Shiboken::GilState state; Shiboken::AutoDecRef arglist(PyTuple_New(1)); - PyTuple_SET_ITEM(arglist, 0, + PyTuple_SetItem(arglist, 0, %CONVERTTOPYTHON[QWebEngineCookieStore::FilterRequest](filterRequest)); Shiboken::AutoDecRef ret(PyObject_CallObject(object(), arglist)); return ret.object() == Py_True; @@ -39,7 +39,7 @@ void QWebEngineNotificationFunctor::operator() Shiboken::GilState state; Shiboken::AutoDecRef arglist(PyTuple_New(1)); auto *notification = webEngineNotification.release(); - PyTuple_SET_ITEM(arglist.object(), 0, + PyTuple_SetItem(arglist.object(), 0, %CONVERTTOPYTHON[QWebEngineNotification*](notification)); Shiboken::AutoDecRef ret(PyObject_CallObject(object(), arglist)); }; @@ -59,8 +59,8 @@ return resultPair.first; QString str; %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, &str); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](str)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QString](str)); // @snippet qwebenginepage-javascriptprompt-return // @snippet qwebenginepage-findtext @@ -69,7 +69,7 @@ auto callback = [callable](const QWebEngineFindTextResult &result) { Shiboken::GilState state; Shiboken::AutoDecRef arglist(PyTuple_New(1)); - PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QWebEngineFindTextResult](result)); + PyTuple_SetItem(arglist, 0, %CONVERTTOPYTHON[QWebEngineFindTextResult](result)); Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist)); Py_DECREF(callable); @@ -89,7 +89,7 @@ auto callback = [printer, callable](bool succeeded) } Shiboken::GilState state; Shiboken::AutoDecRef arglist(PyTuple_New(1)); - PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[bool](succeeded)); + PyTuple_SetItem(arglist, 0, %CONVERTTOPYTHON[bool](succeeded)); Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist)); Py_DECREF(callable); Py_DECREF(printer); @@ -106,7 +106,7 @@ auto callback = [callable](const QString &text) { Shiboken::GilState state; Shiboken::AutoDecRef arglist(PyTuple_New(1)); - PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](text)); + PyTuple_SetItem(arglist, 0, %CONVERTTOPYTHON[QString](text)); Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist)); Py_DECREF(callable); }; diff --git a/sources/pyside6/PySide6/glue/qtwidgets.cpp b/sources/pyside6/PySide6/glue/qtwidgets.cpp index eeab64a43..bc9dc99d6 100644 --- a/sources/pyside6/PySide6/glue/qtwidgets.cpp +++ b/sources/pyside6/PySide6/glue/qtwidgets.cpp @@ -36,8 +36,8 @@ if (%0) { QGraphicsItem *item_ = nullptr; %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(&item_); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QGraphicsItem *](item_)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QGraphicsItem *](item_)); // @snippet qgraphicsitem-isblockedbymodalpanel // @snippet qitemeditorfactory-registereditor @@ -60,13 +60,13 @@ int _row; QFormLayout::ItemRole _role; %CPPSELF->%FUNCTION_NAME(%ARGUMENT_NAMES, &_row, &_role); %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](_row)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[int](_row)); // On the C++ side, *rolePtr is not set if row == -1, in which case on // the Python side this gets converted to a random value outside the // enum range. Fix this by setting _role to a default value here. if (_row == -1) _role = QFormLayout::LabelRole; -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QFormLayout::ItemRole](_role)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QFormLayout::ItemRole](_role)); // @snippet qformlayout-fix-args // @snippet qfiledialog-return @@ -74,8 +74,8 @@ PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QFormLayout::ItemRole](_role)); %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, &%5, %6); %END_ALLOW_THREADS %PYARG_0 = PyTuple_New(2); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](%5)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QString](%5)); // @snippet qfiledialog-return // @snippet qwidget-addaction-glue @@ -392,10 +392,10 @@ removeLayoutOwnership(%CPPSELF, %1); int a, b, c, d; %CPPSELF.%FUNCTION_NAME(%1, &a, &b, &c, &d); %PYARG_0 = PyTuple_New(4); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[int](a)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[int](b)); -PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](c)); -PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[int](d)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[int](a)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[int](b)); +PyTuple_SetItem(%PYARG_0, 2, %CONVERTTOPYTHON[int](c)); +PyTuple_SetItem(%PYARG_0, 3, %CONVERTTOPYTHON[int](d)); // @snippet qgridlayout-getitemposition // @snippet qgraphicsscene-destroyitemgroup @@ -569,7 +569,7 @@ static void QApplicationConstructor(PyObject *self, PyObject *pyargv, QApplicati { static int argc; static char **argv; - PyObject *stringlist = PyTuple_GET_ITEM(pyargv, 0); + PyObject *stringlist = PyTuple_GetItem(pyargv, 0); if (Shiboken::listToArgcArgv(stringlist, &argc, &argv, "PySideApp")) { *cptr = new QApplicationWrapper(argc, argv, 0); Shiboken::Object::releaseOwnership(reinterpret_cast<SbkObject *>(self)); diff --git a/sources/pyside6/PySide6/glue/qtxml.cpp b/sources/pyside6/PySide6/glue/qtxml.cpp index 120579927..b97d774e7 100644 --- a/sources/pyside6/PySide6/glue/qtxml.cpp +++ b/sources/pyside6/PySide6/glue/qtxml.cpp @@ -10,8 +10,8 @@ bool _ret_ = %CPPSELF.%FUNCTION_NAME(%ARGUMENT_NAMES, &_errorMsg_, &_errorLine_, &_errorColumn_); %END_ALLOW_THREADS %PYARG_0 = PyTuple_New(4); -PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[bool](_ret_)); -PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](_errorMsg_)); -PyTuple_SET_ITEM(%PYARG_0, 2, %CONVERTTOPYTHON[int](_errorLine_)); -PyTuple_SET_ITEM(%PYARG_0, 3, %CONVERTTOPYTHON[int](_errorColumn_)); +PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[bool](_ret_)); +PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[QString](_errorMsg_)); +PyTuple_SetItem(%PYARG_0, 2, %CONVERTTOPYTHON[int](_errorLine_)); +PyTuple_SetItem(%PYARG_0, 3, %CONVERTTOPYTHON[int](_errorColumn_)); // @snippet qdomdocument-setcontent |
