jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implemented DynamicMetaObject optiomizations.

Browse source 
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Lauro Neto <lauro.neto@openbossa.org>
This commit is contained in:
Renato Filho 2011-07-21 17:57:17 -03:00
commit 38e6275aad
8 changed files with 144 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libpyside/globalreceiver.cpp
View file

@ -162,6 +162,8 @@ GlobalReceiver::GlobalReceiver()
{
//slot used to be notifyed of object destrouction
m_metaObject.addSlot(RECEIVER_DESTROYED_SLOT_NAME);
m_metaObject.update();
setObjectName("GLOBAL RECEIVER");
}
GlobalReceiver::~GlobalReceiver()
@ -198,13 +200,12 @@ void GlobalReceiver::disconnectNotify(QObject* source, int slotId)
const QMetaObject* GlobalReceiver::metaObject() const
{
return &m_metaObject;
return m_metaObject.update();
}
void GlobalReceiver::addSlot(const char* slot, PyObject* callback)
int GlobalReceiver::addSlot(const char* slot, PyObject* callback)
{
m_metaObject.addSlot(slot);
int slotId = m_metaObject.indexOfSlot(slot);
int slotId = m_metaObject.addSlot(slot);
if (!m_slotReceivers.contains(slotId))
m_slotReceivers[slotId] = new DynamicSlotData(slotId, callback, this);
@ -219,8 +220,8 @@ void GlobalReceiver::addSlot(const char* slot, PyObject* callback)
if (isShortCircuit)
m_shortCircuitSlots << slotId;
Q_ASSERT(slotId >= QObject::staticMetaObject.methodCount());
return slotId;
}
void GlobalReceiver::removeSlot(int slotId)
@ -248,7 +249,7 @@ int GlobalReceiver::qt_metacall(QMetaObject::Call call, int id, void** args)
{
Q_ASSERT(call == QMetaObject::InvokeMetaMethod);
Q_ASSERT(id >= QObject::staticMetaObject.methodCount());
QMetaMethod slot = m_metaObject.method(id);
QMetaMethod slot = metaObject()->method(id);
Q_ASSERT(slot.methodType() == QMetaMethod::Slot);
if (strcmp(slot.signature(), RECEIVER_DESTROYED_SLOT_NAME) == 0) {