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

Fix memory leak on GlobalReceiver.

Browse source
This commit is contained in:
Renato Filho 2011-07-19 11:30:12 -03:00 • committed by Hugo Parente Lima
commit 8ec6934396
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libpyside/globalreceiver.cpp
View file

@ -45,7 +45,7 @@ class DynamicSlotData
void addRef(const QObject* o); void addRef(const QObject* o);
void decRef(const QObject* o); void decRef(const QObject* o);
void clear(); void clear();
bool hasRefTo(const QObject* o) const; int hasRefTo(const QObject* o) const;
int refCount() const; int refCount() const;
int id() const; int id() const;
PyObject* call(PyObject* args); PyObject* call(PyObject* args);
@ -122,11 +122,9 @@ int DynamicSlotData::id() const
return m_id; return m_id;
} }
bool DynamicSlotData::hasRefTo(const QObject *o) const int DynamicSlotData::hasRefTo(const QObject *o) const
{ {
if (m_refs.size()) return m_refs.count(o);
return m_refs.contains(o);
return false;
} }
void DynamicSlotData::clear() void DynamicSlotData::clear()
@ -261,8 +259,11 @@ int GlobalReceiver::qt_metacall(QMetaObject::Call call, int id, void** args)
QHash<int, DynamicSlotData*>::iterator i = copy.begin(); QHash<int, DynamicSlotData*>::iterator i = copy.begin();
while(i != copy.end()) { while(i != copy.end()) {
//Remove all refs //Remove all refs
while (i.value()->hasRefTo(arg)) int refs = i.value()->hasRefTo(arg);
while(refs) {
disconnectNotify(arg, i.key()); disconnectNotify(arg, i.key());
refs--;
}
i++; i++;
} }
return -1; return -1;