X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;h=be6eac1c229b0fe89ca8fb14305458d95c7c50e8;hb=73696998505c35c02bd019f78e9f502cbc36da5b;hp=8033030f922831f67cea3bb8e1bdd277425a8ce3;hpb=1adc00219ba072da57994764d086beed8ffb7bb4;p=quassel.git

diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h
index 8033030f..be6eac1c 100644
--- a/src/core/coreidentity.h
+++ b/src/core/coreidentity.h
@@ -41,8 +41,6 @@ class CoreCertManager : public CertManager {
 public:
   CoreCertManager(CoreIdentity &identity);
 
-  void setId(IdentityId id);
-
 #ifdef HAVE_SSL
   virtual const QSslKey &sslKey() const;
   virtual const QSslCertificate &sslCert() const;
@@ -52,6 +50,8 @@ public slots:
   virtual void setSslCert(const QByteArray &encoded);
 #endif
 
+  void setId(IdentityId id);
+
 private:
   CoreIdentity &identity;
 };
@@ -77,9 +77,9 @@ public:
   inline const QSslCertificate &sslCert() const { return _sslCert; }
   inline void setSslCert(const QSslCertificate &cert) { _sslCert = cert; }
   void setSslCert(const QByteArray &encoded);
-#endif HAVE_SSL
+#endif /* HAVE_SSL */
 
-  CoreIdentity& CoreIdentity::operator=(const CoreIdentity &identity);
+  CoreIdentity& operator=(const CoreIdentity &identity);
 
 private:
 #ifdef HAVE_SSL