X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fidentity.h;h=4345642d1e6d6a05b984b73aad76dea37373f016;hp=66305e4e3e8a31c4027eb769340369c763a4306e;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce diff --git a/src/common/identity.h b/src/common/identity.h index 66305e4e..4345642d 100644 --- a/src/common/identity.h +++ b/src/common/identity.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 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 * @@ -15,11 +15,12 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef IDENTITY_H -#define IDENTITY_H +#pragma once + +#include "common-export.h" #include #include @@ -30,35 +31,34 @@ #include "types.h" #include "syncableobject.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 STORED false) - Q_PROPERTY(QString identityName READ identityName WRITE setIdentityName STORED false) - Q_PROPERTY(QString realName READ realName WRITE setRealName STORED false) - Q_PROPERTY(QStringList nicks READ nicks WRITE setNicks STORED false) - Q_PROPERTY(QString awayNick READ awayNick WRITE setAwayNick STORED false) - Q_PROPERTY(bool awayNickEnabled READ awayNickEnabled WRITE setAwayNickEnabled STORED false) - Q_PROPERTY(QString awayReason READ awayReason WRITE setAwayReason STORED false) - Q_PROPERTY(bool awayReasonEnabled READ awayReasonEnabled WRITE setAwayReasonEnabled STORED false) - Q_PROPERTY(bool autoAwayEnabled READ autoAwayEnabled WRITE setAutoAwayEnabled STORED false) - Q_PROPERTY(int autoAwayTime READ autoAwayTime WRITE setAutoAwayTime STORED false) - Q_PROPERTY(QString autoAwayReason READ autoAwayReason WRITE setAutoAwayReason STORED false) - Q_PROPERTY(bool autoAwayReasonEnabled READ autoAwayReasonEnabled WRITE setAutoAwayReasonEnabled STORED false) - Q_PROPERTY(bool detachAwayEnabled READ detachAwayEnabled WRITE setDetachAwayEnabled STORED false) - Q_PROPERTY(QString detachAwayReason READ detachAwayReason WRITE setDetachAwayReason STORED false) - Q_PROPERTY(bool detachAwayReasonEnabled READ detachAwayReasonEnabled WRITE setDetachAwayReasonEnabled STORED false) - Q_PROPERTY(QString ident READ ident WRITE setIdent STORED false) - Q_PROPERTY(QString kickReason READ kickReason WRITE setKickReason STORED false) - Q_PROPERTY(QString partReason READ partReason WRITE setPartReason STORED false) - Q_PROPERTY(QString quitReason READ quitReason WRITE setQuitReason STORED false) + Q_PROPERTY(IdentityId identityId READ id WRITE setId) + Q_PROPERTY(QString identityName READ identityName WRITE setIdentityName) + Q_PROPERTY(QString realName READ realName WRITE setRealName) + Q_PROPERTY(QStringList nicks READ nicks WRITE setNicks) + Q_PROPERTY(QString awayNick READ awayNick WRITE setAwayNick) + Q_PROPERTY(bool awayNickEnabled READ awayNickEnabled WRITE setAwayNickEnabled) + Q_PROPERTY(QString awayReason READ awayReason WRITE setAwayReason) + Q_PROPERTY(bool awayReasonEnabled READ awayReasonEnabled WRITE setAwayReasonEnabled) + Q_PROPERTY(bool autoAwayEnabled READ autoAwayEnabled WRITE setAutoAwayEnabled) + Q_PROPERTY(int autoAwayTime READ autoAwayTime WRITE setAutoAwayTime) + Q_PROPERTY(QString autoAwayReason READ autoAwayReason WRITE setAutoAwayReason) + Q_PROPERTY(bool autoAwayReasonEnabled READ autoAwayReasonEnabled WRITE setAutoAwayReasonEnabled) + Q_PROPERTY(bool detachAwayEnabled READ detachAwayEnabled WRITE setDetachAwayEnabled) + Q_PROPERTY(QString detachAwayReason READ detachAwayReason WRITE setDetachAwayReason) + Q_PROPERTY(bool detachAwayReasonEnabled READ detachAwayReasonEnabled WRITE setDetachAwayReasonEnabled) + Q_PROPERTY(QString ident READ ident WRITE setIdent) + Q_PROPERTY(QString kickReason READ kickReason WRITE setKickReason) + 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; } + Identity(IdentityId id = 0, QObject *parent = nullptr); + Identity(const Identity &other, QObject *parent = nullptr); void setToDefaults(); @@ -165,16 +165,16 @@ Q_DECLARE_METATYPE(Identity) #include #include -class CertManager : public SyncableObject +class COMMON_EXPORT CertManager : public SyncableObject { - SYNCABLE_OBJECT Q_OBJECT - Q_PROPERTY(QByteArray sslKey READ sslKeyPem WRITE setSslKey STORED false) - Q_PROPERTY(QByteArray sslCert READ sslCertPem WRITE setSslCert STORED false) + 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; } + CertManager(IdentityId id, QObject *parent = nullptr) : SyncableObject(QString::number(id.toInt()), parent) {} virtual const QSslKey &sslKey() const = 0; inline QByteArray sslKeyPem() const { return sslKey().toPem(); } @@ -186,7 +186,4 @@ public slots: inline virtual void setSslCert(const QByteArray &encoded) { SYNC(ARG(encoded)) } }; - #endif // HAVE_SSL - -#endif // IDENTITY_H