X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.h;h=fb35acae2eef6161e755d06f76473246f78cffb4;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hp=9f6fdc075231ad9b498c7ea0c332fb9f25f41a27;hpb=3e63cb8a6e83765069a45101b86ae9e21dcc57ad;p=quassel.git diff --git a/src/client/clientidentity.h b/src/client/clientidentity.h index 9f6fdc07..fb35acae 100644 --- a/src/client/clientidentity.h +++ b/src/client/clientidentity.h @@ -20,18 +20,20 @@ #pragma once +#include "client-export.h" + #include "identity.h" class ClientCertManager; -class CertIdentity : public Identity +class CLIENT_EXPORT CertIdentity : public Identity { Q_OBJECT public: - CertIdentity(IdentityId id = 0, QObject *parent = 0); - CertIdentity(const Identity &other, QObject *parent = 0); - CertIdentity(const CertIdentity &other, QObject *parent = 0); + CertIdentity(IdentityId id = 0, QObject *parent = nullptr); + CertIdentity(const Identity &other, QObject *parent = nullptr); + CertIdentity(const CertIdentity &other, QObject *parent = nullptr); #ifdef HAVE_SSL inline bool isDirty() const { return _isDirty; } @@ -57,8 +59,8 @@ private slots: void markClean(); private: - ClientCertManager *_certManager; - bool _isDirty; + ClientCertManager *_certManager{nullptr}; + bool _isDirty{false}; QSslKey _sslKey; QSslCertificate _sslCert; #endif //HAVE_SSL @@ -69,6 +71,7 @@ private: // ClientCertManager // ======================================== #ifdef HAVE_SSL + class ClientCertManager : public CertManager { Q_OBJECT @@ -76,12 +79,12 @@ class ClientCertManager : public CertManager public: ClientCertManager(IdentityId id, CertIdentity *parent) : CertManager(id, parent), _certIdentity(parent) {} - virtual inline const QSslKey &sslKey() const { return _certIdentity->sslKey(); } - virtual inline const QSslCertificate &sslCert() const { return _certIdentity->sslCert(); } + inline const QSslKey &sslKey() const override { return _certIdentity->sslKey(); } + inline const QSslCertificate &sslCert() const override { return _certIdentity->sslCert(); } 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; private: CertIdentity *_certIdentity;