X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.h;h=fb35acae2eef6161e755d06f76473246f78cffb4;hp=2ff4cb8364ba981a514843068c448067a570f707;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=92fc8c5b119111a35ab8423c3cbde5b2a022badf diff --git a/src/client/clientidentity.h b/src/client/clientidentity.h index 2ff4cb83..fb35acae 100644 --- a/src/client/clientidentity.h +++ b/src/client/clientidentity.h @@ -31,9 +31,9 @@ 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; } @@ -59,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 @@ -79,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;