X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcoreidentity.h;h=6cb6cd1159bfdb43bb0388a26b4d07cb5405b6a3;hb=56b69808aa71b882aa792fadfda2733d765c2ba8;hp=f87f5314c2ae332c485935cc9128542c7d936ae3;hpb=4c83963b1d77f4c2dbae606876be0eee59f53dae;p=quassel.git

diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h
index f87f5314..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  *
@@ -23,38 +23,46 @@
 
 #include "identity.h"
 
+#ifdef HAVE_SSL
 #include <QSslKey>
 #include <QSslCertificate>
+#endif //HAVE_SSL
 
-class CoreIdentity;
 class SignalProxy;
 
 // ========================================
 //  CoreCertManager
 // ========================================
+#ifdef HAVE_SSL
+class CoreIdentity;
 class CoreCertManager : public CertManager {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
 public:
   CoreCertManager(CoreIdentity &identity);
 
+#ifdef HAVE_SSL
   virtual const QSslKey &sslKey() const;
   virtual const QSslCertificate &sslCert() const;
 
 public slots:
   virtual void setSslKey(const QByteArray &encoded);
   virtual void setSslCert(const QByteArray &encoded);
+#endif
 
   void setId(IdentityId id);
 
 private:
   CoreIdentity &identity;
 };
+#endif //HAVE_SSL
 
 // =========================================
 //  CoreIdentity
 // =========================================
 class CoreIdentity : public Identity {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
 public:
@@ -64,29 +72,33 @@ 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 */
 
-  CoreIdentity& CoreIdentity::operator=(const CoreIdentity &identity);
+  CoreIdentity& operator=(const CoreIdentity &identity);
 
 private:
+#ifdef HAVE_SSL
   QSslKey _sslKey;
   QSslCertificate _sslCert;
 
   CoreCertManager _certManager;
+#endif
 };
 
+#ifdef HAVE_SSL
 inline const QSslKey &CoreCertManager::sslKey() const {
   return identity.sslKey();
 }
 inline const QSslCertificate &CoreCertManager::sslCert() const {
   return identity.sslCert();
 }
-
-
+#endif
 
 #endif //COREIDENTITY_H