X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.cpp;fp=src%2Fcore%2Fcoreidentity.cpp;h=a508d4b2312881186040845d66c15e7f29ce5149;hp=e567c90506318ef93b82119e875f980d7e4beffe;hb=1a5c1814a0c52f6f35e65c7033b2f896bf1188e3;hpb=df38a9238d603ec8d2040619befa50980d994916

diff --git a/src/core/coreidentity.cpp b/src/core/coreidentity.cpp
index e567c905..a508d4b2 100644
--- a/src/core/coreidentity.cpp
+++ b/src/core/coreidentity.cpp
@@ -24,51 +24,36 @@
 
 CoreIdentity::CoreIdentity(IdentityId id, QObject* parent)
     : Identity(id, parent)
-#ifdef HAVE_SSL
     , _certManager(this)
-#endif
 {
-#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
 {
-#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
 {
-#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,9 +69,6 @@ void CoreIdentity::setSslCert(const QByteArray& encoded)
     setSslCert(QSslCertificate(encoded));
 }
 
-#endif
-
-#ifdef HAVE_SSL
 // ========================================
 //  CoreCertManager
 // ========================================
@@ -114,5 +96,3 @@ void CoreCertManager::setSslCert(const QByteArray& encoded)
     _identity->setSslCert(encoded);
     CertManager::setSslCert(encoded);
 }
-
-#endif  // HAVE_SSL