diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-02 15:50:55 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-03 08:22:13 +0000 |
| commit | a5848518433a7adf1ca83b19441a1abe6734d8a9 (patch) | |
| tree | c88f23cebd3636399f4ee1f31acd8c3e6d561a40 /sources/pyside2/libpyside/signalmanager.cpp | |
| parent | 9dd6617b0228d5aa35bd7747560161a3f28c9c47 (diff) | |
Remove Python2 from C++ code
Task-number: PYSIDE-1339
Task-number: PYSIDE-904
Change-Id: I7e4ffaeabb2ac8a5ffe165d43b3475a7e5d57447
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside2/libpyside/signalmanager.cpp')
| -rw-r--r-- | sources/pyside2/libpyside/signalmanager.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/sources/pyside2/libpyside/signalmanager.cpp b/sources/pyside2/libpyside/signalmanager.cpp index 7ac69843f..69ee67932 100644 --- a/sources/pyside2/libpyside/signalmanager.cpp +++ b/sources/pyside2/libpyside/signalmanager.cpp @@ -85,7 +85,6 @@ namespace { static PyObject *parseArguments(const QList< QByteArray >& paramTypes, void **args); static bool emitShortCircuitSignal(QObject *source, int signalIndex, PyObject *args); -#ifdef IS_PY3K static void destroyMetaObject(PyObject *obj) { void *ptr = PyCapsule_GetPointer(obj, 0); @@ -95,17 +94,6 @@ namespace { Shiboken::BindingManager::instance().releaseWrapper(wrapper); delete meta; } - -#else - static void destroyMetaObject(void *obj) - { - auto meta = reinterpret_cast<PySide::MetaObjectBuilder *>(obj); - SbkObject *wrapper = Shiboken::BindingManager::instance().retrieveWrapper(meta); - if (wrapper) - Shiboken::BindingManager::instance().releaseWrapper(wrapper); - delete meta; - } -#endif } namespace PySide { @@ -569,11 +557,7 @@ static MetaObjectBuilder *metaBuilderFromDict(PyObject *dict) // PyDict_GetItem would touch PyThreadState_GET and the global error state. // PyDict_GetItemWithError instead can work without GIL. PyObject *pyBuilder = PyDict_GetItemWithError(dict, metaObjectAttr); -#ifdef IS_PY3K return reinterpret_cast<MetaObjectBuilder *>(PyCapsule_GetPointer(pyBuilder, nullptr)); -#else - return reinterpret_cast<MetaObjectBuilder *>(PyCObject_AsVoidPtr(pyBuilder)); -#endif } int SignalManager::registerMetaMethodGetIndex(QObject *source, const char *signature, QMetaMethod::MethodType type) @@ -599,12 +583,7 @@ int SignalManager::registerMetaMethodGetIndex(QObject *source, const char *signa // Create a instance meta object if (!dmo) { dmo = new MetaObjectBuilder(Py_TYPE(pySelf), metaObject); -#ifdef IS_PY3K PyObject *pyDmo = PyCapsule_New(dmo, 0, destroyMetaObject); -#else - PyObject *pyDmo = PyCObject_FromVoidPtr(dmo, destroyMetaObject); -#endif - PyObject_SetAttr(pySelf, metaObjectAttr, pyDmo); Py_DECREF(pyDmo); } |