X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.cpp;h=a508d4b2312881186040845d66c15e7f29ce5149;hp=f0b75b05754c0addc94c87a6b899ee40c3cbbf68;hb=c0d6dc0dec628f2e143e37ecc95cec45e636f8a5;hpb=c1cf157116de7fc3da96203aa6f03c38c7ebb650

diff --git a/src/core/coreidentity.cpp b/src/core/coreidentity.cpp
index f0b75b05..a508d4b2 100644
--- a/src/core/coreidentity.cpp
+++ b/src/core/coreidentity.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,51 +24,36 @@
 
 CoreIdentity::CoreIdentity(IdentityId id, QObject* parent)
     : Identity(id, parent)
-#ifdef HAVE_SSL
-    , _certManager(*this)
-#endif
+    , _certManager(this)
 {
-#ifdef HAVE_SSL
     connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
     connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
-#endif
 }
 
 CoreIdentity::CoreIdentity(const Identity& other, QObject* parent)
     : Identity(other, parent)
-#ifdef HAVE_SSL
-    , _certManager(*this)
-#endif
+    , _certManager(this)
 {
-#ifdef HAVE_SSL
     connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
     connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
-#endif
 }
 
 CoreIdentity::CoreIdentity(const CoreIdentity& other, QObject* parent)
     : Identity(other, parent)
-#ifdef HAVE_SSL
     , _sslKey(other._sslKey)
     , _sslCert(other._sslCert)
-    , _certManager(*this)
-#endif
+    , _certManager(this)
 {
-#ifdef HAVE_SSL
     connect(this, &Identity::idSet, &_certManager, &CoreCertManager::setId);
     connect(&_certManager, &SyncableObject::updated, this, &SyncableObject::updated);
-#endif
 }
 
 void CoreIdentity::synchronize(SignalProxy* proxy)
 {
     proxy->synchronize(this);
-#ifdef HAVE_SSL
     proxy->synchronize(&_certManager);
-#endif
 }
 
-#ifdef HAVE_SSL
 void CoreIdentity::setSslKey(const QByteArray& encoded)
 {
     QSslKey key(encoded, QSsl::Rsa);
@@ -84,45 +69,30 @@ void CoreIdentity::setSslCert(const QByteArray& encoded)
     setSslCert(QSslCertificate(encoded));
 }
 
-#endif
-
-CoreIdentity& CoreIdentity::operator=(const CoreIdentity& identity)
-{
-    Identity::operator=(identity);
-#ifdef HAVE_SSL
-    _sslKey = identity._sslKey;
-    _sslCert = identity._sslCert;
-#endif
-    return *this;
-}
-
-#ifdef HAVE_SSL
 // ========================================
 //  CoreCertManager
 // ========================================
 
-CoreCertManager::CoreCertManager(CoreIdentity& identity)
-    : CertManager(identity.id())
-    , identity(identity)
+CoreCertManager::CoreCertManager(CoreIdentity* identity)
+    : CertManager(identity->id())
+    , _identity(identity)
 {
     setAllowClientUpdates(true);
 }
 
 void CoreCertManager::setId(IdentityId id)
 {
-    renameObject(QString::number(id.toInt()));
+    setObjectName(QString::number(id.toInt()));
 }
 
 void CoreCertManager::setSslKey(const QByteArray& encoded)
 {
-    identity.setSslKey(encoded);
+    _identity->setSslKey(encoded);
     CertManager::setSslKey(encoded);
 }
 
 void CoreCertManager::setSslCert(const QByteArray& encoded)
 {
-    identity.setSslCert(encoded);
+    _identity->setSslCert(encoded);
     CertManager::setSslCert(encoded);
 }
-
-#endif  // HAVE_SSL