/***************************************************************************
- * Copyright (C) 2005-2018 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 *
CoreIdentity::CoreIdentity(IdentityId id, QObject* parent)
: Identity(id, parent)
#ifdef HAVE_SSL
- , _certManager(*this)
+ , _certManager(this)
#endif
{
#ifdef HAVE_SSL
CoreIdentity::CoreIdentity(const Identity& other, QObject* parent)
: Identity(other, parent)
#ifdef HAVE_SSL
- , _certManager(*this)
+ , _certManager(this)
#endif
{
#ifdef HAVE_SSL
#ifdef HAVE_SSL
, _sslKey(other._sslKey)
, _sslCert(other._sslCert)
- , _certManager(*this)
+ , _certManager(this)
#endif
{
#ifdef HAVE_SSL
#endif
-CoreIdentity& CoreIdentity::operator=(const CoreIdentity& identity)
-{
- Identity::operator=(identity);
-#ifdef HAVE_SSL
- _sslKey = identity._sslKey;
- _sslCert = identity._sslCert;
-#endif
- return *this;
-}
-
#ifdef HAVE_SSL
// ========================================
// CoreCertManager
// ========================================
-CoreCertManager::CoreCertManager(CoreIdentity& identity)
- : CertManager(identity.id())
- , identity(identity)
+CoreCertManager::CoreCertManager(CoreIdentity* identity)
+ : CertManager(identity->id())
+ , _identity(identity)
{
setAllowClientUpdates(true);
}
void CoreCertManager::setId(IdentityId id)
{
- renameObject(QString::number(id.toInt()));
+ setObjectName(QString::number(id.toInt()));
}
void CoreCertManager::setSslKey(const QByteArray& encoded)
{
- identity.setSslKey(encoded);
+ _identity->setSslKey(encoded);
CertManager::setSslKey(encoded);
}
void CoreCertManager::setSslCert(const QByteArray& encoded)
{
- identity.setSslCert(encoded);
+ _identity->setSslCert(encoded);
CertManager::setSslCert(encoded);
}