X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientidentity.h;h=5e58917920afbea39d7e0cc25e1ed9718668865d;hp=28b68b77f7ac4b9646e56cbe70119147e0286623;hb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;hpb=921e54680da16fcf2adb7a90506875aceb6633a4 diff --git a/src/client/clientidentity.h b/src/client/clientidentity.h index 28b68b77..5e589179 100644 --- a/src/client/clientidentity.h +++ b/src/client/clientidentity.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,22 +18,22 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef CLIENTIDENTITY_H -#define CLIENTIDENTITY_H +#pragma once + +#include "client-export.h" #include "identity.h" class ClientCertManager; -class CertIdentity : public Identity +class CLIENT_EXPORT CertIdentity : public Identity { - SYNCABLE_OBJECT - Q_OBJECT + Q_OBJECT public: - CertIdentity(IdentityId id = 0, QObject *parent = 0); - CertIdentity(const Identity &other, QObject *parent = 0); - CertIdentity(const CertIdentity &other, QObject *parent = 0); + CertIdentity(IdentityId id = 0, QObject *parent = nullptr); + CertIdentity(const Identity &other, QObject *parent = nullptr); + CertIdentity(const CertIdentity &other, QObject *parent = nullptr); #ifdef HAVE_SSL inline bool isDirty() const { return _isDirty; } @@ -71,6 +71,7 @@ private: // ClientCertManager // ======================================== #ifdef HAVE_SSL + class ClientCertManager : public CertManager { Q_OBJECT @@ -89,7 +90,4 @@ private: CertIdentity *_certIdentity; }; - #endif //HAVE_SSL - -#endif //CLIENTIDENTITY_H