X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;h=0265881c42e05aaaedea49a467a2861bb4a28ea8;hb=df38a9238d603ec8d2040619befa50980d994916;hp=a211a726dc9497dac3edc2f8984005ed367c6424;hpb=cc6e7c08709c4e761e2fd9c2e322751015497003;p=quassel.git diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h index a211a726..0265881c 100644 --- a/src/core/coreidentity.h +++ b/src/core/coreidentity.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2019 by the Quassel Project * + * Copyright (C) 2005-2020 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -20,6 +20,8 @@ #pragma once +#include "core-export.h" + #include "identity.h" #ifdef HAVE_SSL @@ -34,12 +36,12 @@ class SignalProxy; // ======================================== #ifdef HAVE_SSL class CoreIdentity; -class CoreCertManager : public CertManager +class CORE_EXPORT CoreCertManager : public CertManager { Q_OBJECT public: - CoreCertManager(CoreIdentity& identity); + CoreCertManager(CoreIdentity* identity); # ifdef HAVE_SSL const QSslKey& sslKey() const override; @@ -53,7 +55,7 @@ public slots: void setId(IdentityId id); private: - CoreIdentity& identity; + CoreIdentity* _identity{nullptr}; }; #endif // HAVE_SSL @@ -61,7 +63,7 @@ private: // ========================================= // CoreIdentity // ========================================= -class CoreIdentity : public Identity +class CORE_EXPORT CoreIdentity : public Identity { Q_OBJECT @@ -81,8 +83,6 @@ public: void setSslCert(const QByteArray& encoded); #endif /* HAVE_SSL */ - CoreIdentity& operator=(const CoreIdentity& identity); - private: #ifdef HAVE_SSL QSslKey _sslKey; @@ -95,12 +95,12 @@ private: #ifdef HAVE_SSL inline const QSslKey& CoreCertManager::sslKey() const { - return identity.sslKey(); + return _identity->sslKey(); } inline const QSslCertificate& CoreCertManager::sslCert() const { - return identity.sslCert(); + return _identity->sslCert(); } #endif