X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.h;h=6deb916c67953e0b28e432724df53a3541886f67;hp=f0956205aedcf5bad9a10bbeec7b5926dcd700c3;hb=HEAD;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf diff --git a/src/common/identity.h b/src/common/identity.h index f0956205..59436678 100644 --- a/src/common/identity.h +++ b/src/common/identity.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2022 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,22 +18,25 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef IDENTITY_H -#define IDENTITY_H +#pragma once + +#include "common-export.h" #include #include #include +#include +#include #include #include -#include "types.h" #include "syncableobject.h" +#include "types.h" -class Identity : public SyncableObject +class COMMON_EXPORT Identity : public SyncableObject { - SYNCABLE_OBJECT Q_OBJECT + SYNCABLE_OBJECT Q_PROPERTY(IdentityId identityId READ id WRITE setId) Q_PROPERTY(QString identityName READ identityName WRITE setIdentityName) @@ -55,81 +58,80 @@ class Identity : public SyncableObject Q_PROPERTY(QString partReason READ partReason WRITE setPartReason) Q_PROPERTY(QString quitReason READ quitReason WRITE setQuitReason) -public : - Identity(IdentityId id = 0, QObject *parent = 0); - Identity(const Identity &other, QObject *parent = 0); - inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; } +public: + Identity(IdentityId id = 0, QObject* parent = nullptr); + Identity(const Identity& other, QObject* parent = nullptr); void setToDefaults(); - bool operator==(const Identity &other) const; - bool operator!=(const Identity &other) const; + bool operator==(const Identity& other) const; + bool operator!=(const Identity& other) const; inline bool isValid() const { return id().isValid(); } inline IdentityId id() const { return _identityId; } - inline const QString &identityName() const { return _identityName; } - inline const QString &realName() const { return _realName; } - inline const QStringList &nicks() const { return _nicks; } - inline const QString &awayNick() const { return _awayNick; } + inline const QString& identityName() const { return _identityName; } + inline const QString& realName() const { return _realName; } + inline const QStringList& nicks() const { return _nicks; } + inline const QString& awayNick() const { return _awayNick; } inline bool awayNickEnabled() const { return _awayNickEnabled; } - inline const QString &awayReason() const { return _awayReason; } + inline const QString& awayReason() const { return _awayReason; } inline bool awayReasonEnabled() const { return _awayReasonEnabled; } inline bool autoAwayEnabled() const { return _autoAwayEnabled; } inline int autoAwayTime() const { return _autoAwayTime; } - inline const QString &autoAwayReason() const { return _autoAwayReason; } + inline const QString& autoAwayReason() const { return _autoAwayReason; } inline bool autoAwayReasonEnabled() const { return _autoAwayReasonEnabled; } inline bool detachAwayEnabled() const { return _detachAwayEnabled; } - inline const QString &detachAwayReason() const { return _detachAwayReason; } + inline const QString& detachAwayReason() const { return _detachAwayReason; } inline bool detachAwayReasonEnabled() const { return _detachAwayReasonEnabled; } - inline const QString &ident() const { return _ident; } - inline const QString &kickReason() const { return _kickReason; } - inline const QString &partReason() const { return _partReason; } - inline const QString &quitReason() const { return _quitReason; } + inline const QString& ident() const { return _ident; } + inline const QString& kickReason() const { return _kickReason; } + inline const QString& partReason() const { return _partReason; } + inline const QString& quitReason() const { return _quitReason; } public slots: void setId(IdentityId id); - void setIdentityName(const QString &name); - void setRealName(const QString &realName); - void setNicks(const QStringList &nicks); - void setAwayNick(const QString &awayNick); + void setIdentityName(const QString& name); + void setRealName(const QString& realName); + void setNicks(const QStringList& nicks); + void setAwayNick(const QString& awayNick); void setAwayNickEnabled(bool enabled); - void setAwayReason(const QString &awayReason); + void setAwayReason(const QString& awayReason); void setAwayReasonEnabled(bool enabled); void setAutoAwayEnabled(bool enabled); void setAutoAwayTime(int time); - void setAutoAwayReason(const QString &reason); + void setAutoAwayReason(const QString& reason); void setAutoAwayReasonEnabled(bool enabled); void setDetachAwayEnabled(bool enabled); - void setDetachAwayReason(const QString &reason); + void setDetachAwayReason(const QString& reason); void setDetachAwayReasonEnabled(bool enabled); - void setIdent(const QString &ident); - void setKickReason(const QString &reason); - void setPartReason(const QString &reason); - void setQuitReason(const QString &reason); + void setIdent(const QString& ident); + void setKickReason(const QString& reason); + void setPartReason(const QString& reason); + void setQuitReason(const QString& reason); - void copyFrom(const Identity &other); + void copyFrom(const Identity& other); signals: void idSet(IdentityId id); -// void identityNameSet(const QString &name); -// void realNameSet(const QString &realName); - void nicksSet(const QStringList &nicks); -// void awayNickSet(const QString &awayNick); -// void awayNickEnabledSet(bool); -// void awayReasonSet(const QString &awayReason); -// void awayReasonEnabledSet(bool); -// void autoAwayEnabledSet(bool); -// void autoAwayTimeSet(int); -// void autoAwayReasonSet(const QString &); -// void autoAwayReasonEnabledSet(bool); -// void detachAwayEnabledSet(bool); -// void detachAwayReasonSet(const QString &); -// void detachAwayReasonEnabledSet(bool); -// void identSet(const QString &); -// void kickReasonSet(const QString &); -// void partReasonSet(const QString &); -// void quitReasonSet(const QString &); + // void identityNameSet(const QString &name); + // void realNameSet(const QString &realName); + void nicksSet(const QStringList& nicks); + // void awayNickSet(const QString &awayNick); + // void awayNickEnabledSet(bool); + // void awayReasonSet(const QString &awayReason); + // void awayReasonEnabledSet(bool); + // void autoAwayEnabledSet(bool); + // void autoAwayTimeSet(int); + // void autoAwayReasonSet(const QString &); + // void autoAwayReasonEnabledSet(bool); + // void detachAwayEnabledSet(bool); + // void detachAwayReasonSet(const QString &); + // void detachAwayReasonEnabledSet(bool); + // void identSet(const QString &); + // void kickReasonSet(const QString &); + // void partReasonSet(const QString &); + // void quitReasonSet(const QString &); private: IdentityId _identityId; @@ -152,41 +154,33 @@ private: QString defaultNick(); QString defaultRealName(); - friend QDataStream &operator>>(QDataStream &in, Identity &identity); + friend QDataStream& operator>>(QDataStream& in, Identity& identity); }; - -QDataStream &operator<<(QDataStream &out, Identity identity); -QDataStream &operator>>(QDataStream &in, Identity &identity); +QDataStream& operator<<(QDataStream& out, Identity identity); +QDataStream& operator>>(QDataStream& in, Identity& identity); Q_DECLARE_METATYPE(Identity) -#ifdef HAVE_SSL -#include -#include - -class CertManager : public SyncableObject +class COMMON_EXPORT CertManager : public SyncableObject { - SYNCABLE_OBJECT Q_OBJECT + SYNCABLE_OBJECT + Q_PROPERTY(QByteArray sslKey READ sslKeyPem WRITE setSslKey) Q_PROPERTY(QByteArray sslCert READ sslCertPem WRITE setSslCert) -public : - CertManager(IdentityId id, QObject *parent = 0) : SyncableObject(QString::number(id.toInt()), parent) {} - inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; } +public: + CertManager(IdentityId id, QObject* parent = nullptr) + : SyncableObject(QString::number(id.toInt()), parent) + {} - virtual const QSslKey &sslKey() const = 0; + virtual const QSslKey& sslKey() const = 0; inline QByteArray sslKeyPem() const { return sslKey().toPem(); } - virtual const QSslCertificate &sslCert() const = 0; + virtual const QSslCertificate& sslCert() const = 0; inline QByteArray sslCertPem() const { return sslCert().toPem(); } public slots: - inline virtual void setSslKey(const QByteArray &encoded) { SYNC(ARG(encoded)) } - inline virtual void setSslCert(const QByteArray &encoded) { SYNC(ARG(encoded)) } + inline virtual void setSslKey(const QByteArray& encoded) { SYNC(ARG(encoded)) } + inline virtual void setSslCert(const QByteArray& encoded) { SYNC(ARG(encoded)) } }; - - -#endif // HAVE_SSL - -#endif // IDENTITY_H