X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;h=72d331c62613c4cf19689f1302dd7853b5f7a9ea;hb=9188f1a4880dc7f4c26612a265c1d874f6df5a8c;hp=9fbc24ea297fa71176aeb5085f54b74d4288a79c;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;p=quassel.git

diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h
index 9fbc24ea..72d331c6 100644
--- a/src/core/coreidentity.h
+++ b/src/core/coreidentity.h
@@ -23,9 +23,9 @@
 #include "identity.h"
 
 #ifdef HAVE_SSL
-#include <QSslKey>
-#include <QSslCertificate>
-#endif //HAVE_SSL
+#    include <QSslCertificate>
+#    include <QSslKey>
+#endif  // HAVE_SSL
 
 class SignalProxy;
 
@@ -39,25 +39,24 @@ class CoreCertManager : public CertManager
     Q_OBJECT
 
 public:
-    CoreCertManager(CoreIdentity &identity);
+    CoreCertManager(CoreIdentity& identity);
 
-#ifdef HAVE_SSL
-    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);
-#endif
+    void setSslKey(const QByteArray& encoded) override;
+    void setSslCert(const QByteArray& encoded) override;
+#    endif
 
     void setId(IdentityId id);
 
 private:
-    CoreIdentity &identity;
+    CoreIdentity& identity;
 };
 
-
-#endif //HAVE_SSL
+#endif  // HAVE_SSL
 
 // =========================================
 //  CoreIdentity
@@ -67,22 +66,22 @@ class CoreIdentity : public Identity
     Q_OBJECT
 
 public:
-    CoreIdentity(IdentityId id, QObject *parent = nullptr);
-    CoreIdentity(const Identity &other, QObject *parent = nullptr);
-    CoreIdentity(const CoreIdentity &other, QObject *parent = nullptr);
+    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);
 
 #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);
+    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 &operator=(const CoreIdentity &identity);
+    CoreIdentity& operator=(const CoreIdentity& identity);
 
 private:
 #ifdef HAVE_SSL
@@ -93,15 +92,13 @@ private:
 #endif
 };
 
-
 #ifdef HAVE_SSL
-inline const QSslKey &CoreCertManager::sslKey() const
+inline const QSslKey& CoreCertManager::sslKey() const
 {
     return identity.sslKey();
 }
 
-
-inline const QSslCertificate &CoreCertManager::sslCert() const
+inline const QSslCertificate& CoreCertManager::sslCert() const
 {
     return identity.sslCert();
 }