X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;h=b2ba09f121bc6f10a8462d697c175c8ecd2fa932;hb=d778861aa194578cd90e019b64fe285ea58746c4;hp=573f9c5797d3531007926a5a70501ae51c3c98e6;hpb=c820e4b0bb1aeab59d65f9024301f468159e2337;p=quassel.git

diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h
index 573f9c57..b2ba09f1 100644
--- a/src/core/coreidentity.h
+++ b/src/core/coreidentity.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2019 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,17 +24,14 @@
 
 #include "identity.h"
 
-#ifdef HAVE_SSL
-#    include <QSslCertificate>
-#    include <QSslKey>
-#endif  // HAVE_SSL
+#include <QSslCertificate>
+#include <QSslKey>
 
 class SignalProxy;
 
 // ========================================
 //  CoreCertManager
 // ========================================
-#ifdef HAVE_SSL
 class CoreIdentity;
 class CORE_EXPORT CoreCertManager : public CertManager
 {
@@ -43,14 +40,12 @@ class CORE_EXPORT CoreCertManager : public CertManager
 public:
     CoreCertManager(CoreIdentity* identity);
 
-#    ifdef HAVE_SSL
     const QSslKey& sslKey() const override;
     const QSslCertificate& sslCert() const override;
 
 public slots:
     void setSslKey(const QByteArray& encoded) override;
     void setSslCert(const QByteArray& encoded) override;
-#    endif
 
     void setId(IdentityId id);
 
@@ -58,8 +53,6 @@ private:
     CoreIdentity* _identity{nullptr};
 };
 
-#endif  // HAVE_SSL
-
 // =========================================
 //  CoreIdentity
 // =========================================
@@ -74,25 +67,20 @@ public:
 
     void synchronize(SignalProxy* proxy);
 
-#ifdef HAVE_SSL
     inline const QSslKey& sslKey() const { return _sslKey; }
     inline void setSslKey(const QSslKey& key) { _sslKey = key; }
     void setSslKey(const QByteArray& encoded);
     inline const QSslCertificate& sslCert() const { return _sslCert; }
     inline void setSslCert(const QSslCertificate& cert) { _sslCert = cert; }
     void setSslCert(const QByteArray& encoded);
-#endif /* HAVE_SSL */
 
 private:
-#ifdef HAVE_SSL
     QSslKey _sslKey;
     QSslCertificate _sslCert;
 
     CoreCertManager _certManager;
-#endif
 };
 
-#ifdef HAVE_SSL
 inline const QSslKey& CoreCertManager::sslKey() const
 {
     return _identity->sslKey();
@@ -102,5 +90,3 @@ inline const QSslCertificate& CoreCertManager::sslCert() const
 {
     return _identity->sslCert();
 }
-
-#endif