diff options
| author | renatofilho <renato.filho@openbossa.org> | 2010-10-29 16:21:50 -0300 |
|---|---|---|
| committer | renatofilho <renato.filho@openbossa.org> | 2010-11-03 10:28:15 -0300 |
| commit | c7945787c556d2e3e40a1b9ef93147c640ee8ff6 (patch) | |
| tree | 96ac95001401d2c300f4833b3dfd2b9855578260 /libpyside/signalmanager.cpp | |
| parent | 62fd909705a4bf99590346712b040f7b40c9bb74 (diff) | |
Created Singal/Slot/Property namespace for pure C structures.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org>
Lauro Neto <lauro.neto@openbossa.org>
Diffstat (limited to 'libpyside/signalmanager.cpp')
| -rw-r--r-- | libpyside/signalmanager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp index 53f6a4510..1e5824e88 100644 --- a/libpyside/signalmanager.cpp +++ b/libpyside/signalmanager.cpp @@ -355,7 +355,7 @@ bool SignalManager::emitSignal(QObject* source, const char* signal, PyObject* ar int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id, void** args) { const QMetaObject* metaObject = object->metaObject(); - PySideQProperty* pp = 0; + PySideProperty* pp = 0; PyObject* pp_name = 0; QMetaProperty mp; Shiboken::TypeResolver* typeResolver = 0; @@ -368,7 +368,7 @@ int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id, return id - metaObject->methodCount(); pp_name = PyString_FromString(mp.name()); - pp = qpropertyGetObject(pySelf, pp_name); + pp = Property::getObject(pySelf, pp_name); if (!pp) { qWarning("Invalid property."); Py_XDECREF(pp_name); @@ -382,7 +382,7 @@ int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id, #ifndef QT_NO_PROPERTIES case QMetaObject::ReadProperty: { - PyObject* value = qpropertyGet(pp, pySelf); + PyObject* value = Property::getValue(pp, pySelf); if (value) { typeResolver->toCpp(value, &args[0]); Py_DECREF(value); @@ -395,12 +395,12 @@ int SignalManager::qt_metacall(QObject* object, QMetaObject::Call call, int id, case QMetaObject::WriteProperty: { Shiboken::AutoDecRef value(typeResolver->toPython(args[0])); - qpropertySet(pp, pySelf, value); + Property::setValue(pp, pySelf, value); break; } case QMetaObject::ResetProperty: - qpropertyReset(pp, pp_name); + Property::reset(pp, pp_name); break; case QMetaObject::QueryPropertyDesignable: |