X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.h;h=864538f5b11970d12a16790127bf1929ac91fbca;hp=dfdf2b3df07e1629463e2adb9e748562e867f18a;hb=1a5c1814a0c52f6f35e65c7033b2f896bf1188e3;hpb=c1cf157116de7fc3da96203aa6f03c38c7ebb650 diff --git a/src/client/clientidentity.h b/src/client/clientidentity.h index dfdf2b3d..864538f5 100644 --- a/src/client/clientidentity.h +++ b/src/client/clientidentity.h @@ -1,5 +1,5 @@ /*************************************************************************** - * 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 * @@ -35,13 +35,8 @@ public: CertIdentity(const Identity& other, QObject* parent = nullptr); CertIdentity(const CertIdentity& other, QObject* parent = nullptr); -#ifdef HAVE_SSL inline bool isDirty() const { return _isDirty; } -#else - inline bool isDirty() const { return false; } -#endif -#ifdef HAVE_SSL void enableEditSsl(bool enable = true); inline const QSslKey& sslKey() const { return _sslKey; } inline const QSslCertificate& sslCert() const { return _sslCert; } @@ -63,13 +58,11 @@ private: bool _isDirty{false}; QSslKey _sslKey; QSslCertificate _sslCert; -#endif // HAVE_SSL }; // ======================================== // ClientCertManager // ======================================== -#ifdef HAVE_SSL class ClientCertManager : public CertManager { @@ -92,4 +85,3 @@ private: CertIdentity* _certIdentity; }; -#endif // HAVE_SSL