From 9c7d754dd853d40ed8d0464762afebf7ec1034e5 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sat, 15 Feb 2014 21:55:30 +0100 Subject: [PATCH] Remove the STORED attribute from Q_PROPERTY declarations Due to some lack of documentation reading and consequential misunderstanding of what the STORED=false attribute means for a QProperty, we still had some really old headers wrongly declaring those. I'm not aware of any effect on anything that having those has, but better to just clean those up. --- src/common/identity.h | 42 ++++++++++++++++++------------------ src/common/ircchannel.h | 10 ++++----- src/common/ircuser.h | 32 +++++++++++++-------------- src/common/network.h | 48 ++++++++++++++++++++--------------------- 4 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/common/identity.h b/src/common/identity.h index d9226084..e0757b1d 100644 --- a/src/common/identity.h +++ b/src/common/identity.h @@ -35,25 +35,25 @@ class Identity : public SyncableObject SYNCABLE_OBJECT Q_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); @@ -169,8 +169,8 @@ class 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) + 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) {} diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h index d9fe9e92..693ed9c5 100644 --- a/src/common/ircchannel.h +++ b/src/common/ircchannel.h @@ -37,13 +37,13 @@ class IrcChannel : public SyncableObject SYNCABLE_OBJECT Q_OBJECT - Q_PROPERTY(QString name READ name STORED false) - Q_PROPERTY(QString topic READ topic WRITE setTopic STORED false) - Q_PROPERTY(QString password READ password WRITE setPassword STORED false) - Q_PROPERTY(bool encrypted READ encrypted WRITE setEncrypted STORED false) + Q_PROPERTY(QString name READ name) + Q_PROPERTY(QString topic READ topic WRITE setTopic) + Q_PROPERTY(QString password READ password WRITE setPassword) + Q_PROPERTY(bool encrypted READ encrypted WRITE setEncrypted) public : - IrcChannel(const QString &channelname, Network *network); + IrcChannel(const QString &channelname, Network *network); ~IrcChannel(); bool isKnownUser(IrcUser *ircuser) const; diff --git a/src/common/ircuser.h b/src/common/ircuser.h index b0924591..3424a63c 100644 --- a/src/common/ircuser.h +++ b/src/common/ircuser.h @@ -39,22 +39,22 @@ class IrcUser : public SyncableObject SYNCABLE_OBJECT Q_OBJECT - Q_PROPERTY(QString user READ user WRITE setUser STORED false) - Q_PROPERTY(QString host READ host WRITE setHost STORED false) - Q_PROPERTY(QString nick READ nick WRITE setNick STORED false) - Q_PROPERTY(QString realName READ realName WRITE setRealName STORED false) - Q_PROPERTY(bool away READ isAway WRITE setAway STORED false) - Q_PROPERTY(QString awayMessage READ awayMessage WRITE setAwayMessage STORED false) - Q_PROPERTY(QDateTime idleTime READ idleTime WRITE setIdleTime STORED false) - Q_PROPERTY(QDateTime loginTime READ loginTime WRITE setLoginTime STORED false) - Q_PROPERTY(QString server READ server WRITE setServer STORED false) - Q_PROPERTY(QString ircOperator READ ircOperator WRITE setIrcOperator STORED false) - Q_PROPERTY(int lastAwayMessage READ lastAwayMessage WRITE setLastAwayMessage STORED false) - Q_PROPERTY(QString whoisServiceReply READ whoisServiceReply WRITE setWhoisServiceReply STORED false) - Q_PROPERTY(QString suserHost READ suserHost WRITE setSuserHost STORED false) - Q_PROPERTY(bool encrypted READ encrypted WRITE setEncrypted STORED false) - - Q_PROPERTY(QStringList channels READ channels STORED false) + Q_PROPERTY(QString user READ user WRITE setUser) + Q_PROPERTY(QString host READ host WRITE setHost) + Q_PROPERTY(QString nick READ nick WRITE setNick) + Q_PROPERTY(QString realName READ realName WRITE setRealName) + Q_PROPERTY(bool away READ isAway WRITE setAway) + Q_PROPERTY(QString awayMessage READ awayMessage WRITE setAwayMessage) + Q_PROPERTY(QDateTime idleTime READ idleTime WRITE setIdleTime) + Q_PROPERTY(QDateTime loginTime READ loginTime WRITE setLoginTime) + Q_PROPERTY(QString server READ server WRITE setServer) + Q_PROPERTY(QString ircOperator READ ircOperator WRITE setIrcOperator) + Q_PROPERTY(int lastAwayMessage READ lastAwayMessage WRITE setLastAwayMessage) + Q_PROPERTY(QString whoisServiceReply READ whoisServiceReply WRITE setWhoisServiceReply) + Q_PROPERTY(QString suserHost READ suserHost WRITE setSuserHost) + Q_PROPERTY(bool encrypted READ encrypted WRITE setEncrypted) + + Q_PROPERTY(QStringList channels READ channels) Q_PROPERTY(QString userModes READ userModes WRITE setUserModes) public : diff --git a/src/common/network.h b/src/common/network.h index 4be02a3a..01e6158a 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -50,30 +50,30 @@ class Network : public SyncableObject Q_OBJECT Q_ENUMS(ConnectionState) - Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName STORED false) - Q_PROPERTY(QString currentServer READ currentServer WRITE setCurrentServer STORED false) - Q_PROPERTY(QString myNick READ myNick WRITE setMyNick STORED false) - Q_PROPERTY(int latency READ latency WRITE setLatency STORED false) - Q_PROPERTY(QByteArray codecForServer READ codecForServer WRITE setCodecForServer STORED false) - Q_PROPERTY(QByteArray codecForEncoding READ codecForEncoding WRITE setCodecForEncoding STORED false) - Q_PROPERTY(QByteArray codecForDecoding READ codecForDecoding WRITE setCodecForDecoding STORED false) - Q_PROPERTY(IdentityId identityId READ identity WRITE setIdentity STORED false) - Q_PROPERTY(bool isConnected READ isConnected WRITE setConnected STORED false) - //Q_PROPERTY(Network::ConnectionState connectionState READ connectionState WRITE setConnectionState STORED false) - Q_PROPERTY(int connectionState READ connectionState WRITE setConnectionState STORED false) - Q_PROPERTY(bool useRandomServer READ useRandomServer WRITE setUseRandomServer STORED false) - Q_PROPERTY(QStringList perform READ perform WRITE setPerform STORED false) - Q_PROPERTY(bool useAutoIdentify READ useAutoIdentify WRITE setUseAutoIdentify STORED false) - Q_PROPERTY(QString autoIdentifyService READ autoIdentifyService WRITE setAutoIdentifyService STORED false) - Q_PROPERTY(QString autoIdentifyPassword READ autoIdentifyPassword WRITE setAutoIdentifyPassword STORED false) - Q_PROPERTY(bool useSasl READ useSasl WRITE setUseSasl STORED false) - Q_PROPERTY(QString saslAccount READ saslAccount WRITE setSaslAccount STORED false) - Q_PROPERTY(QString saslPassword READ saslPassword WRITE setSaslPassword STORED false) - Q_PROPERTY(bool useAutoReconnect READ useAutoReconnect WRITE setUseAutoReconnect STORED false) - Q_PROPERTY(quint32 autoReconnectInterval READ autoReconnectInterval WRITE setAutoReconnectInterval STORED false) - Q_PROPERTY(quint16 autoReconnectRetries READ autoReconnectRetries WRITE setAutoReconnectRetries STORED false) - Q_PROPERTY(bool unlimitedReconnectRetries READ unlimitedReconnectRetries WRITE setUnlimitedReconnectRetries STORED false) - Q_PROPERTY(bool rejoinChannels READ rejoinChannels WRITE setRejoinChannels STORED false) + Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName) + Q_PROPERTY(QString currentServer READ currentServer WRITE setCurrentServer) + Q_PROPERTY(QString myNick READ myNick WRITE setMyNick) + Q_PROPERTY(int latency READ latency WRITE setLatency) + Q_PROPERTY(QByteArray codecForServer READ codecForServer WRITE setCodecForServer) + Q_PROPERTY(QByteArray codecForEncoding READ codecForEncoding WRITE setCodecForEncoding) + Q_PROPERTY(QByteArray codecForDecoding READ codecForDecoding WRITE setCodecForDecoding) + Q_PROPERTY(IdentityId identityId READ identity WRITE setIdentity) + Q_PROPERTY(bool isConnected READ isConnected WRITE setConnected) + //Q_PROPERTY(Network::ConnectionState connectionState READ connectionState WRITE setConnectionState) + Q_PROPERTY(int connectionState READ connectionState WRITE setConnectionState) + Q_PROPERTY(bool useRandomServer READ useRandomServer WRITE setUseRandomServer) + Q_PROPERTY(QStringList perform READ perform WRITE setPerform) + Q_PROPERTY(bool useAutoIdentify READ useAutoIdentify WRITE setUseAutoIdentify) + Q_PROPERTY(QString autoIdentifyService READ autoIdentifyService WRITE setAutoIdentifyService) + Q_PROPERTY(QString autoIdentifyPassword READ autoIdentifyPassword WRITE setAutoIdentifyPassword) + Q_PROPERTY(bool useSasl READ useSasl WRITE setUseSasl) + Q_PROPERTY(QString saslAccount READ saslAccount WRITE setSaslAccount) + Q_PROPERTY(QString saslPassword READ saslPassword WRITE setSaslPassword) + Q_PROPERTY(bool useAutoReconnect READ useAutoReconnect WRITE setUseAutoReconnect) + Q_PROPERTY(quint32 autoReconnectInterval READ autoReconnectInterval WRITE setAutoReconnectInterval) + Q_PROPERTY(quint16 autoReconnectRetries READ autoReconnectRetries WRITE setAutoReconnectRetries) + Q_PROPERTY(bool unlimitedReconnectRetries READ unlimitedReconnectRetries WRITE setUnlimitedReconnectRetries) + Q_PROPERTY(bool rejoinChannels READ rejoinChannels WRITE setRejoinChannels) public : enum ConnectionState { -- 2.20.1