aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6/libpyside
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside6/libpyside')
-rw-r--r--sources/pyside6/libpyside/pyside.cpp8
-rw-r--r--sources/pyside6/libpyside/pyside.h8
-rw-r--r--sources/pyside6/libpyside/pysidesignal.cpp6
-rw-r--r--sources/pyside6/libpyside/pysidesignal.h2
4 files changed, 12 insertions, 12 deletions
diff --git a/sources/pyside6/libpyside/pyside.cpp b/sources/pyside6/libpyside/pyside.cpp
index 59b7f54e9..4fc29597f 100644
--- a/sources/pyside6/libpyside/pyside.cpp
+++ b/sources/pyside6/libpyside/pyside.cpp
@@ -218,12 +218,12 @@ void destroyQCoreApplication()
Py_DECREF(MakeQAppWrapper(nullptr));
}
-std::size_t getSizeOfQObject(SbkObjectType *type)
+std::size_t getSizeOfQObject(PyTypeObject *type)
{
return retrieveTypeUserData(type)->cppObjSize;
}
-void initDynamicMetaObject(SbkObjectType *type, const QMetaObject *base, std::size_t cppObjSize)
+void initDynamicMetaObject(PyTypeObject *type, const QMetaObject *base, std::size_t cppObjSize)
{
//create DynamicMetaObject based on python type
auto userData = new TypeUserData(reinterpret_cast<PyTypeObject *>(type), base, cppObjSize);
@@ -265,7 +265,7 @@ const QMetaObject *retrieveMetaObject(PyObject *pyObj)
return retrieveMetaObject(pyTypeObj);
}
-void initQObjectSubType(SbkObjectType *type, PyObject *args, PyObject * /* kwds */)
+void initQObjectSubType(PyTypeObject *type, PyObject *args, PyObject * /* kwds */)
{
PyTypeObject *qObjType = Shiboken::Conversions::getPythonTypeObject("QObject*");
QByteArray className(Shiboken::String::toCString(PyTuple_GET_ITEM(args, 0)));
@@ -446,7 +446,7 @@ PyTypeObject *getTypeForQObject(const QObject *cppSelf)
return nullptr;
}
-PyObject *getWrapperForQObject(QObject *cppSelf, SbkObjectType *sbk_type)
+PyObject *getWrapperForQObject(QObject *cppSelf, PyTypeObject *sbk_type)
{
PyObject *pyOut = reinterpret_cast<PyObject *>(Shiboken::BindingManager::instance().retrieveWrapper(cppSelf));
if (pyOut) {
diff --git a/sources/pyside6/libpyside/pyside.h b/sources/pyside6/libpyside/pyside.h
index b74cc8414..0362351ea 100644
--- a/sources/pyside6/libpyside/pyside.h
+++ b/sources/pyside6/libpyside/pyside.h
@@ -95,13 +95,13 @@ template<typename T>
struct initQtMetaType<T, false> {
};
-PYSIDE_API void initDynamicMetaObject(SbkObjectType *type, const QMetaObject *base,
+PYSIDE_API void initDynamicMetaObject(PyTypeObject *type, const QMetaObject *base,
std::size_t cppObjSize);
-PYSIDE_API void initQObjectSubType(SbkObjectType *type, PyObject *args, PyObject *kwds);
+PYSIDE_API void initQObjectSubType(PyTypeObject *type, PyObject *args, PyObject *kwds);
PYSIDE_API void initQApp();
/// Return the size in bytes of a type that inherits QObject.
-PYSIDE_API std::size_t getSizeOfQObject(SbkObjectType *type);
+PYSIDE_API std::size_t getSizeOfQObject(PyTypeObject *type);
/* Check if a PyTypeObject or its bases contains a QObject
* \param pyType is the PyTypeObject to check
@@ -143,7 +143,7 @@ PYSIDE_API bool inherits(PyTypeObject *self, const char *class_name);
PYSIDE_API void *nextQObjectMemoryAddr();
PYSIDE_API void setNextQObjectMemoryAddr(void *addr);
-PYSIDE_API PyObject *getWrapperForQObject(QObject *cppSelf, SbkObjectType *sbk_type);
+PYSIDE_API PyObject *getWrapperForQObject(QObject *cppSelf, PyTypeObject *sbk_type);
/// Return the best-matching type for a QObject (Helper for QObject.findType())
/// \param cppSelf QObject instance
diff --git a/sources/pyside6/libpyside/pysidesignal.cpp b/sources/pyside6/libpyside/pysidesignal.cpp
index 3a3b52c2a..c565ca99a 100644
--- a/sources/pyside6/libpyside/pysidesignal.cpp
+++ b/sources/pyside6/libpyside/pysidesignal.cpp
@@ -777,7 +777,7 @@ QByteArray getTypeName(PyObject *type)
if (PyType_Check(type)) {
if (PyType_IsSubtype(reinterpret_cast<PyTypeObject *>(type),
reinterpret_cast<PyTypeObject *>(SbkObject_TypeF()))) {
- auto objType = reinterpret_cast<SbkObjectType *>(type);
+ auto objType = reinterpret_cast<PyTypeObject *>(type);
return Shiboken::ObjectType::getOriginalName(objType);
}
// Translate python types to Qt names
@@ -940,7 +940,7 @@ static typename T::value_type join(T t, const char *sep)
return res;
}
-static void _addSignalToWrapper(SbkObjectType *wrapperType, const char *signalName, PySideSignal *signal)
+static void _addSignalToWrapper(PyTypeObject *wrapperType, const char *signalName, PySideSignal *signal)
{
auto typeDict = wrapperType->tp_dict;
PyObject *homonymousMethod;
@@ -963,7 +963,7 @@ static PyObject *buildQtCompatible(const QByteArray &signature)
return Shiboken::String::fromStringAndSize(ba, ba.size());
}
-void registerSignals(SbkObjectType *pyObj, const QMetaObject *metaObject)
+void registerSignals(PyTypeObject *pyObj, const QMetaObject *metaObject)
{
using SignalSigMap = QHash<QByteArray, QList<SignalSignature> >;
SignalSigMap signalsFound;
diff --git a/sources/pyside6/libpyside/pysidesignal.h b/sources/pyside6/libpyside/pysidesignal.h
index edef37af1..9127c81aa 100644
--- a/sources/pyside6/libpyside/pysidesignal.h
+++ b/sources/pyside6/libpyside/pysidesignal.h
@@ -91,7 +91,7 @@ PYSIDE_API bool checkInstanceType(PyObject *pyObj);
/**
* Register all C++ signals of a QObject on Python type.
*/
-PYSIDE_API void registerSignals(SbkObjectType *pyObj, const QMetaObject *metaObject);
+PYSIDE_API void registerSignals(PyTypeObject *pyObj, const QMetaObject *metaObject);
/**
* This function creates a Signal object which stays attached to QObject class based on a list of QMetaMethods