projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Join current channel if no name is given
[quassel.git]
/
src
/
client
/
clientidentity.cpp
diff --git
a/src/client/clientidentity.cpp
b/src/client/clientidentity.cpp
index
1c2956e
..
6e63ac4
100644
(file)
--- a/
src/client/clientidentity.cpp
+++ b/
src/client/clientidentity.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
19
by the Quassel Project *
+ * Copyright (C) 2005-20
20
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 *
@@
-33,14
+33,11
@@
CertIdentity::CertIdentity(const Identity& other, QObject* parent)
CertIdentity::CertIdentity(const CertIdentity& other, QObject* parent)
: Identity(other, parent)
CertIdentity::CertIdentity(const CertIdentity& other, QObject* parent)
: Identity(other, parent)
-#ifdef HAVE_SSL
, _isDirty(other._isDirty)
, _sslKey(other._sslKey)
, _sslCert(other._sslCert)
, _isDirty(other._isDirty)
, _sslKey(other._sslKey)
, _sslCert(other._sslCert)
-#endif
{}
{}
-#ifdef HAVE_SSL
void CertIdentity::enableEditSsl(bool enable)
{
if (!enable || _certManager)
void CertIdentity::enableEditSsl(bool enable)
{
if (!enable || _certManager)
@@
-101,5
+98,3
@@
void ClientCertManager::setSslCert(const QByteArray& encoded)
{
_certIdentity->setSslCert(QSslCertificate(encoded));
}
{
_certIdentity->setSslCert(QSslCertificate(encoded));
}
-
-#endif // HAVE_SSL