X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;h=6cb6cd1159bfdb43bb0388a26b4d07cb5405b6a3;hp=8033030f922831f67cea3bb8e1bdd277425a8ce3;hb=56b69808aa71b882aa792fadfda2733d765c2ba8;hpb=1adc00219ba072da57994764d086beed8ffb7bb4 diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h index 8033030f..6cb6cd11 100644 --- a/src/core/coreidentity.h +++ b/src/core/coreidentity.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -36,13 +36,12 @@ class SignalProxy; #ifdef HAVE_SSL class CoreIdentity; class CoreCertManager : public CertManager { + SYNCABLE_OBJECT Q_OBJECT public: CoreCertManager(CoreIdentity &identity); - void setId(IdentityId id); - #ifdef HAVE_SSL virtual const QSslKey &sslKey() const; virtual const QSslCertificate &sslCert() const; @@ -52,6 +51,8 @@ public slots: virtual void setSslCert(const QByteArray &encoded); #endif + void setId(IdentityId id); + private: CoreIdentity &identity; }; @@ -61,6 +62,7 @@ private: // CoreIdentity // ========================================= class CoreIdentity : public Identity { + SYNCABLE_OBJECT Q_OBJECT public: @@ -77,9 +79,9 @@ public: inline const QSslCertificate &sslCert() const { return _sslCert; } inline void setSslCert(const QSslCertificate &cert) { _sslCert = cert; } void setSslCert(const QByteArray &encoded); -#endif HAVE_SSL +#endif /* HAVE_SSL */ - CoreIdentity& CoreIdentity::operator=(const CoreIdentity &identity); + CoreIdentity& operator=(const CoreIdentity &identity); private: #ifdef HAVE_SSL