X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreidentity.h;h=57b39e0958abe555eea92c0f03b1951bf0fd4164;hp=f87f5314c2ae332c485935cc9128542c7d936ae3;hb=7c9c1b348382b8b77f96a883945c522d32a478d5;hpb=4c83963b1d77f4c2dbae606876be0eee59f53dae diff --git a/src/core/coreidentity.h b/src/core/coreidentity.h index f87f5314..57b39e09 100644 --- a/src/core/coreidentity.h +++ b/src/core/coreidentity.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-09 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -23,33 +23,39 @@ #include "identity.h" +#ifdef HAVE_SSL #include #include +#endif //HAVE_SSL -class CoreIdentity; class SignalProxy; // ======================================== // CoreCertManager // ======================================== +#ifdef HAVE_SSL +class CoreIdentity; class CoreCertManager : public CertManager { Q_OBJECT public: CoreCertManager(CoreIdentity &identity); +#ifdef HAVE_SSL virtual const QSslKey &sslKey() const; virtual const QSslCertificate &sslCert() const; public slots: virtual void setSslKey(const QByteArray &encoded); virtual void setSslCert(const QByteArray &encoded); +#endif void setId(IdentityId id); private: CoreIdentity &identity; }; +#endif //HAVE_SSL // ========================================= // CoreIdentity @@ -64,29 +70,33 @@ public: void synchronize(SignalProxy *proxy); +#ifdef HAVE_SSL inline const QSslKey &sslKey() const { return _sslKey; } inline void setSslKey(const QSslKey &key) { _sslKey = key; } void setSslKey(const QByteArray &encoded); inline const QSslCertificate &sslCert() const { return _sslCert; } inline void setSslCert(const QSslCertificate &cert) { _sslCert = cert; } void setSslCert(const QByteArray &encoded); +#endif /* HAVE_SSL */ - CoreIdentity& CoreIdentity::operator=(const CoreIdentity &identity); + CoreIdentity& operator=(const CoreIdentity &identity); private: +#ifdef HAVE_SSL QSslKey _sslKey; QSslCertificate _sslCert; CoreCertManager _certManager; +#endif }; +#ifdef HAVE_SSL inline const QSslKey &CoreCertManager::sslKey() const { return identity.sslKey(); } inline const QSslCertificate &CoreCertManager::sslCert() const { return identity.sslCert(); } - - +#endif #endif //COREIDENTITY_H