X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;h=8c65146eb3d7ac19da19b6bac95147855d385357;hp=f87f5314c2ae332c485935cc9128542c7d936ae3;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=4c83963b1d77f4c2dbae606876be0eee59f53dae

diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h
index f87f5314..8c65146e 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-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,78 +15,95 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREIDENTITY_H
-#define COREIDENTITY_H
+#pragma once
 
 #include "identity.h"
 
+#ifdef HAVE_SSL
 #include <QSslKey>
 #include <QSslCertificate>
+#endif //HAVE_SSL
 
-class CoreIdentity;
 class SignalProxy;
 
 // ========================================
 //  CoreCertManager
 // ========================================
-class CoreCertManager : public CertManager {
-  Q_OBJECT
+#ifdef HAVE_SSL
+class CoreIdentity;
+class CoreCertManager : public CertManager
+{
+    Q_OBJECT
 
 public:
-  CoreCertManager(CoreIdentity &identity);
+    CoreCertManager(CoreIdentity &identity);
 
-  virtual const QSslKey &sslKey() const;
-  virtual const QSslCertificate &sslCert() const;
+#ifdef HAVE_SSL
+    const QSslKey &sslKey() const override;
+    const QSslCertificate &sslCert() const override;
 
 public slots:
-  virtual void setSslKey(const QByteArray &encoded);
-  virtual void setSslCert(const QByteArray &encoded);
+    void setSslKey(const QByteArray &encoded) override;
+    void setSslCert(const QByteArray &encoded) override;
+#endif
 
-  void setId(IdentityId id);
+    void setId(IdentityId id);
 
 private:
-  CoreIdentity &identity;
+    CoreIdentity &identity;
 };
 
+
+#endif //HAVE_SSL
+
 // =========================================
 //  CoreIdentity
 // =========================================
-class CoreIdentity : public Identity {
-  Q_OBJECT
+class CoreIdentity : public Identity
+{
+    Q_OBJECT
 
 public:
-  CoreIdentity(IdentityId id, QObject *parent = 0);
-  CoreIdentity(const Identity &other, QObject *parent = 0);
-  CoreIdentity(const CoreIdentity &other, QObject *parent = 0);
+    CoreIdentity(IdentityId id, QObject *parent = nullptr);
+    CoreIdentity(const Identity &other, QObject *parent = nullptr);
+    CoreIdentity(const CoreIdentity &other, QObject *parent = nullptr);
 
-  void synchronize(SignalProxy *proxy);
+    void synchronize(SignalProxy *proxy);
 
-  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);
+#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 */
 
-  CoreIdentity& CoreIdentity::operator=(const CoreIdentity &identity);
+    CoreIdentity &operator=(const CoreIdentity &identity);
 
 private:
-  QSslKey _sslKey;
-  QSslCertificate _sslCert;
+#ifdef HAVE_SSL
+    QSslKey _sslKey;
+    QSslCertificate _sslCert;
 
-  CoreCertManager _certManager;
+    CoreCertManager _certManager;
+#endif
 };
 
-inline const QSslKey &CoreCertManager::sslKey() const {
-  return identity.sslKey();
-}
-inline const QSslCertificate &CoreCertManager::sslCert() const {
-  return identity.sslCert();
+
+#ifdef HAVE_SSL
+inline const QSslKey &CoreCertManager::sslKey() const
+{
+    return identity.sslKey();
 }
 
 
+inline const QSslCertificate &CoreCertManager::sslCert() const
+{
+    return identity.sslCert();
+}
 
-#endif //COREIDENTITY_H
+#endif