X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.cpp;h=6e63ac4d510afd6fe42f240d082548c4d346452a;hp=1c2956e5cd059963eaa3a1a43424141ac75ec08b;hb=47b54cd3ad35201ff2ab9ef6bfdba83fc086558d;hpb=cc6e7c08709c4e761e2fd9c2e322751015497003 diff --git a/src/client/clientidentity.cpp b/src/client/clientidentity.cpp index 1c2956e5..6e63ac4d 100644 --- a/src/client/clientidentity.cpp +++ b/src/client/clientidentity.cpp @@ -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 * @@ -33,14 +33,11 @@ CertIdentity::CertIdentity(const Identity& other, QObject* parent) CertIdentity::CertIdentity(const CertIdentity& other, QObject* parent) : Identity(other, parent) -#ifdef HAVE_SSL , _isDirty(other._isDirty) , _sslKey(other._sslKey) , _sslCert(other._sslCert) -#endif {} -#ifdef HAVE_SSL void CertIdentity::enableEditSsl(bool enable) { if (!enable || _certManager) @@ -101,5 +98,3 @@ void ClientCertManager::setSslCert(const QByteArray& encoded) { _certIdentity->setSslCert(QSslCertificate(encoded)); } - -#endif // HAVE_SSL