projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Don't store a reference in CoreCertManager
[quassel.git]
/
src
/
core
/
coreidentity.cpp
diff --git
a/src/core/coreidentity.cpp
b/src/core/coreidentity.cpp
index
9e6618a
..
5671ae8
100644
(file)
--- a/
src/core/coreidentity.cpp
+++ b/
src/core/coreidentity.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
8
by the Quassel Project *
+ * Copyright (C) 2005-201
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-22,10
+22,10
@@
#include "signalproxy.h"
#include "signalproxy.h"
-CoreIdentity::CoreIdentity(IdentityId id, QObject
*
parent)
+CoreIdentity::CoreIdentity(IdentityId id, QObject
*
parent)
: Identity(id, parent)
#ifdef HAVE_SSL
: Identity(id, parent)
#ifdef HAVE_SSL
- , _certManager(
*
this)
+ , _certManager(this)
#endif
{
#ifdef HAVE_SSL
#endif
{
#ifdef HAVE_SSL
@@
-34,11
+34,10
@@
CoreIdentity::CoreIdentity(IdentityId id, QObject *parent)
#endif
}
#endif
}
-
-CoreIdentity::CoreIdentity(const Identity &other, QObject *parent)
+CoreIdentity::CoreIdentity(const Identity& other, QObject* parent)
: Identity(other, parent)
#ifdef HAVE_SSL
: Identity(other, parent)
#ifdef HAVE_SSL
- , _certManager(
*
this)
+ , _certManager(this)
#endif
{
#ifdef HAVE_SSL
#endif
{
#ifdef HAVE_SSL
@@
-47,13
+46,12
@@
CoreIdentity::CoreIdentity(const Identity &other, QObject *parent)
#endif
}
#endif
}
-
-CoreIdentity::CoreIdentity(const CoreIdentity &other, QObject *parent)
+CoreIdentity::CoreIdentity(const CoreIdentity& other, QObject* parent)
: Identity(other, parent)
#ifdef HAVE_SSL
: Identity(other, parent)
#ifdef HAVE_SSL
- , _sslKey(other._sslKey)
,
- _sslCert(other._sslCert),
-
_certManager(*
this)
+ , _sslKey(other._sslKey)
+ , _sslCert(other._sslCert)
+
, _certManager(
this)
#endif
{
#ifdef HAVE_SSL
#endif
{
#ifdef HAVE_SSL
@@
-62,8
+60,7
@@
CoreIdentity::CoreIdentity(const CoreIdentity &other, QObject *parent)
#endif
}
#endif
}
-
-void CoreIdentity::synchronize(SignalProxy *proxy)
+void CoreIdentity::synchronize(SignalProxy* proxy)
{
proxy->synchronize(this);
#ifdef HAVE_SSL
{
proxy->synchronize(this);
#ifdef HAVE_SSL
@@
-71,9
+68,8
@@
void CoreIdentity::synchronize(SignalProxy *proxy)
#endif
}
#endif
}
-
#ifdef HAVE_SSL
#ifdef HAVE_SSL
-void CoreIdentity::setSslKey(const QByteArray
&
encoded)
+void CoreIdentity::setSslKey(const QByteArray
&
encoded)
{
QSslKey key(encoded, QSsl::Rsa);
if (key.isNull())
{
QSslKey key(encoded, QSsl::Rsa);
if (key.isNull())
@@
-83,57
+79,40
@@
void CoreIdentity::setSslKey(const QByteArray &encoded)
setSslKey(key);
}
setSslKey(key);
}
-
-void CoreIdentity::setSslCert(const QByteArray &encoded)
+void CoreIdentity::setSslCert(const QByteArray& encoded)
{
setSslCert(QSslCertificate(encoded));
}
{
setSslCert(QSslCertificate(encoded));
}
-
-#endif
-
-CoreIdentity &CoreIdentity::operator=(const CoreIdentity &identity)
-{
- Identity::operator=(identity);
-#ifdef HAVE_SSL
- _sslKey = identity._sslKey;
- _sslCert = identity._sslCert;
#endif
#endif
- return *this;
-}
-
#ifdef HAVE_SSL
// ========================================
// CoreCertManager
// ========================================
#ifdef HAVE_SSL
// ========================================
// 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::setId(IdentityId id)
{
void CoreCertManager::setId(IdentityId id)
{
-
renameObject
(QString::number(id.toInt()));
+
setObjectName
(QString::number(id.toInt()));
}
}
-
-void CoreCertManager::setSslKey(const QByteArray &encoded)
+void CoreCertManager::setSslKey(const QByteArray& encoded)
{
{
-
identity.
setSslKey(encoded);
+
_identity->
setSslKey(encoded);
CertManager::setSslKey(encoded);
}
CertManager::setSslKey(encoded);
}
-
-void CoreCertManager::setSslCert(const QByteArray &encoded)
+void CoreCertManager::setSslCert(const QByteArray& encoded)
{
{
-
identity.
setSslCert(encoded);
+
_identity->
setSslCert(encoded);
CertManager::setSslCert(encoded);
}
CertManager::setSslCert(encoded);
}
-
-#endif //HAVE_SSL
+#endif // HAVE_SSL