projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing bulk updates of SyncObjects
[quassel.git]
/
src
/
core
/
coreidentity.cpp
diff --git
a/src/core/coreidentity.cpp
b/src/core/coreidentity.cpp
index
acba205
..
fef7522
100644
(file)
--- a/
src/core/coreidentity.cpp
+++ b/
src/core/coreidentity.cpp
@@
-22,6
+22,7
@@
#include "signalproxy.h"
#include "signalproxy.h"
+INIT_SYNCABLE_OBJECT(CoreIdentity)
CoreIdentity::CoreIdentity(IdentityId id, QObject *parent)
: Identity(id, parent)
#ifdef HAVE_SSL
CoreIdentity::CoreIdentity(IdentityId id, QObject *parent)
: Identity(id, parent)
#ifdef HAVE_SSL
@@
-30,7
+31,7
@@
CoreIdentity::CoreIdentity(IdentityId id, QObject *parent)
{
#ifdef HAVE_SSL
connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
{
#ifdef HAVE_SSL
connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
- connect(&_certManager, SIGNAL(updated(
const QVariantMap &)), this, SIGNAL(updated(const QVariantMap &
)));
+ connect(&_certManager, SIGNAL(updated(
)), this, SIGNAL(updated(
)));
#endif
}
#endif
}
@@
-42,7
+43,7
@@
CoreIdentity::CoreIdentity(const Identity &other, QObject *parent)
{
#ifdef HAVE_SSL
connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
{
#ifdef HAVE_SSL
connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
- connect(&_certManager, SIGNAL(updated(
const QVariantMap &)), this, SIGNAL(updated(const QVariantMap &
)));
+ connect(&_certManager, SIGNAL(updated(
)), this, SIGNAL(updated(
)));
#endif
}
#endif
}
@@
-56,7
+57,7
@@
CoreIdentity::CoreIdentity(const CoreIdentity &other, QObject *parent)
{
#ifdef HAVE_SSL
connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
{
#ifdef HAVE_SSL
connect(this, SIGNAL(idSet(IdentityId)), &_certManager, SLOT(setId(IdentityId)));
- connect(&_certManager, SIGNAL(updated(
const QVariantMap &)), this, SIGNAL(updated(const QVariantMap &
)));
+ connect(&_certManager, SIGNAL(updated(
)), this, SIGNAL(updated(
)));
#endif
}
#endif
}
@@
-93,6
+94,7
@@
CoreIdentity &CoreIdentity::operator=(const CoreIdentity &identity) {
// ========================================
// CoreCertManager
// ========================================
// ========================================
// CoreCertManager
// ========================================
+INIT_SYNCABLE_OBJECT(CoreCertManager)
CoreCertManager::CoreCertManager(CoreIdentity &identity)
: CertManager(identity.id()),
identity(identity)
CoreCertManager::CoreCertManager(CoreIdentity &identity)
: CertManager(identity.id()),
identity(identity)