diff options
-rw-r--r-- | libpyside/pysideproperty.cpp | 7 | ||||
-rw-r--r-- | libpyside/pysideproperty.h | 2 | ||||
-rw-r--r-- | libpyside/pysidesignal.cpp | 7 | ||||
-rw-r--r-- | libpyside/pysidesignal.h | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/libpyside/pysideproperty.cpp b/libpyside/pysideproperty.cpp index fb9116557..5f11d36d8 100644 --- a/libpyside/pysideproperty.cpp +++ b/libpyside/pysideproperty.cpp @@ -205,7 +205,7 @@ void init(PyObject* module) PyModule_AddObject(module, QPROPERTY_CLASS_NAME, ((PyObject*)&PySidePropertyType)); } -bool isPropertyType(PyObject* pyObj) +bool checkType(PyObject* pyObj) { if (pyObj) { return PyType_IsSubtype(pyObj->ob_type, &PySidePropertyType); @@ -213,6 +213,11 @@ bool isPropertyType(PyObject* pyObj) return false; } +bool isPropertyType(PyObject* pyObj) +{ + return checkType(pyObj); +} + int setValue(PySideProperty* self, PyObject* source, PyObject* value) { PyObject* fset = self->d->fset; diff --git a/libpyside/pysideproperty.h b/libpyside/pysideproperty.h index b5bad18d4..ce2704a13 100644 --- a/libpyside/pysideproperty.h +++ b/libpyside/pysideproperty.h @@ -43,7 +43,9 @@ namespace PySide { namespace Property { typedef void (*MetaCallHandler)(PySideProperty*,PyObject*,QMetaObject::Call, void**); +PYSIDE_API bool checkType(PyObject* pyObj); +//Deprecated (use checkType) PYSIDE_API bool isPropertyType(PyObject* pyObj); /** diff --git a/libpyside/pysidesignal.cpp b/libpyside/pysidesignal.cpp index 4cbc789b1..763456a11 100644 --- a/libpyside/pysidesignal.cpp +++ b/libpyside/pysidesignal.cpp @@ -473,6 +473,13 @@ void init(PyObject* module) Py_INCREF(&PySideSignalInstanceType); } +bool checkType(PyObject* pyObj) +{ + if (pyObj) + return PyType_IsSubtype(pyObj->ob_type, &PySideSignalType); + return false; +} + void updateSourceObject(PyObject* source) { PyTypeObject * objType = reinterpret_cast<PyTypeObject *>(PyObject_Type(source)); diff --git a/libpyside/pysidesignal.h b/libpyside/pysidesignal.h index 443572c73..d0efe16ab 100644 --- a/libpyside/pysidesignal.h +++ b/libpyside/pysidesignal.h @@ -49,6 +49,8 @@ extern "C" namespace PySide { namespace Signal { +PYSIDE_API bool checkType(PyObject* type); + /** * This function creates a Signal object which stay attached to QObject class * |