projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merging NetworkConnection into CoreNetwork.
[quassel.git]
/
src
/
common
/
signalproxy.cpp
diff --git
a/src/common/signalproxy.cpp
b/src/common/signalproxy.cpp
index
5d30203
..
c551c24
100644
(file)
--- a/
src/common/signalproxy.cpp
+++ b/
src/common/signalproxy.cpp
@@
-440,8
+440,6
@@
void SignalProxy::setArgTypes(QObject* obj, int methodId) {
const QList<int> &SignalProxy::argTypes(QObject *obj, int methodId) {
const QMetaObject *meta = metaObject(obj);
const QList<int> &SignalProxy::argTypes(QObject *obj, int methodId) {
const QMetaObject *meta = metaObject(obj);
- if(!_classInfo.contains(meta))
- qDebug() << obj << meta;
Q_ASSERT(_classInfo.contains(meta));
if(!_classInfo[meta]->argTypes.contains(methodId))
setArgTypes(obj, methodId);
Q_ASSERT(_classInfo.contains(meta));
if(!_classInfo[meta]->argTypes.contains(methodId))
setArgTypes(obj, methodId);
@@
-719,9
+717,9
@@
void SignalProxy::detachSender() {
}
void SignalProxy::detachObject(QObject* obj) {
}
void SignalProxy::detachObject(QObject* obj) {
+ stopSync(static_cast<SyncableObject *>(obj));
detachSignals(obj);
detachSlots(obj);
detachSignals(obj);
detachSlots(obj);
- stopSync(static_cast<SyncableObject *>(obj));
}
void SignalProxy::detachSignals(QObject* sender) {
}
void SignalProxy::detachSignals(QObject* sender) {