summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a9a4e32)
Storing references violates all sorts of Best Practices, and also
prevents the compiler from implicitly declaring a copy assignment
operator. Store a pointer instead, and clean up the API a bit.
CoreIdentity::CoreIdentity(IdentityId id, QObject* parent)
: Identity(id, parent)
#ifdef HAVE_SSL
CoreIdentity::CoreIdentity(IdentityId id, QObject* parent)
: Identity(id, parent)
#ifdef HAVE_SSL
CoreIdentity::CoreIdentity(const Identity& other, QObject* parent)
: Identity(other, parent)
#ifdef HAVE_SSL
CoreIdentity::CoreIdentity(const Identity& other, QObject* parent)
: Identity(other, parent)
#ifdef HAVE_SSL
#ifdef HAVE_SSL
, _sslKey(other._sslKey)
, _sslCert(other._sslCert)
#ifdef HAVE_SSL
, _sslKey(other._sslKey)
, _sslCert(other._sslCert)
// CoreCertManager
// ========================================
// CoreCertManager
// ========================================
-CoreCertManager::CoreCertManager(CoreIdentity& identity)
- : CertManager(identity.id())
- , identity(identity)
+CoreCertManager::CoreCertManager(CoreIdentity* identity)
+ : CertManager(identity->id())
+ , _identity(identity)
{
setAllowClientUpdates(true);
}
{
setAllowClientUpdates(true);
}
void CoreCertManager::setSslKey(const QByteArray& encoded)
{
void CoreCertManager::setSslKey(const QByteArray& encoded)
{
- identity.setSslKey(encoded);
+ _identity->setSslKey(encoded);
CertManager::setSslKey(encoded);
}
void CoreCertManager::setSslCert(const QByteArray& encoded)
{
CertManager::setSslKey(encoded);
}
void CoreCertManager::setSslCert(const QByteArray& encoded)
{
- identity.setSslCert(encoded);
+ _identity->setSslCert(encoded);
CertManager::setSslCert(encoded);
}
CertManager::setSslCert(encoded);
}
+#include "core-export.h"
+
#include "identity.h"
#ifdef HAVE_SSL
#include "identity.h"
#ifdef HAVE_SSL
// ========================================
#ifdef HAVE_SSL
class CoreIdentity;
// ========================================
#ifdef HAVE_SSL
class CoreIdentity;
-class CoreCertManager : public CertManager
+class CORE_EXPORT CoreCertManager : public CertManager
- CoreCertManager(CoreIdentity& identity);
+ CoreCertManager(CoreIdentity* identity);
# ifdef HAVE_SSL
const QSslKey& sslKey() const override;
# ifdef HAVE_SSL
const QSslKey& sslKey() const override;
void setId(IdentityId id);
private:
void setId(IdentityId id);
private:
- CoreIdentity& identity;
+ CoreIdentity* _identity{nullptr};
// =========================================
// CoreIdentity
// =========================================
// =========================================
// CoreIdentity
// =========================================
-class CoreIdentity : public Identity
+class CORE_EXPORT CoreIdentity : public Identity
#ifdef HAVE_SSL
inline const QSslKey& CoreCertManager::sslKey() const
{
#ifdef HAVE_SSL
inline const QSslKey& CoreCertManager::sslKey() const
{
- return identity.sslKey();
+ return _identity->sslKey();
}
inline const QSslCertificate& CoreCertManager::sslCert() const
{
}
inline const QSslCertificate& CoreCertManager::sslCert() const
{
- return identity.sslCert();
+ return _identity->sslCert();