projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
if it compiles it should fix the new missing query issue :)
[quassel.git]
/
src
/
common
/
signalproxy.cpp
diff --git
a/src/common/signalproxy.cpp
b/src/common/signalproxy.cpp
index
a738715
..
756e63c
100644
(file)
--- a/
src/common/signalproxy.cpp
+++ b/
src/common/signalproxy.cpp
@@
-231,16
+231,17
@@
SignalProxy::SignalProxy(ProxyMode mode, QIODevice* device, QObject* parent)
}
SignalProxy::~SignalProxy() {
}
SignalProxy::~SignalProxy() {
- QList<SyncableObject *> syncObjects;
QHash<QByteArray, ObjectId>::iterator classIter = _syncSlave.begin();
while(classIter != _syncSlave.end()) {
QHash<QByteArray, ObjectId>::iterator classIter = _syncSlave.begin();
while(classIter != _syncSlave.end()) {
- syncObjects << classIter->values();
+ ObjectId::iterator objIter = classIter->begin();
+ while(objIter != classIter->end()) {
+ SyncableObject *obj = objIter.value();
+ objIter = classIter->erase(objIter);
+ obj->stopSynchronize(this);
+ }
classIter++;
}
_syncSlave.clear();
classIter++;
}
_syncSlave.clear();
- foreach(SyncableObject *obj, syncObjects) {
- obj->stopSynchronize(this);
- }
removeAllPeers();
}
removeAllPeers();
}
@@
-414,7
+415,6
@@
void SignalProxy::renameObject(const SyncableObject *obj, const QString &newname
}
void SignalProxy::objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname) {
}
void SignalProxy::objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname) {
- qDebug() << "SignalProxy::objectRenamed" << classname << newname << oldname;
if(proxyMode() == Server)
return;
if(proxyMode() == Server)
return;
@@
-1172,7
+1172,6
@@
const QHash<int, int> &SignalProxy::ExtendedMetaObject::receiveMap() {
if(receiverId != -1) {
receiveMap[i] = receiverId;
if(receiverId != -1) {
receiveMap[i] = receiverId;
- qDebug() << requestSlot.signature() << _meta->method(receiverId).signature() << "---" << i << receiverId;
}
}
_receiveMap = receiveMap;
}
}
_receiveMap = receiveMap;