X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;fp=src%2Fcore%2Fcoreidentity.h;h=72d331c62613c4cf19689f1302dd7853b5f7a9ea;hp=8c65146eb3d7ac19da19b6bac95147855d385357;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805 diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h index 8c65146e..72d331c6 100644 --- a/src/core/coreidentity.h +++ b/src/core/coreidentity.h @@ -23,9 +23,9 @@ #include "identity.h" #ifdef HAVE_SSL -#include -#include -#endif //HAVE_SSL +# include +# include +#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 - const QSslKey &sslKey() const override; - const QSslCertificate &sslCert() const override; +# 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 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(); }