X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=01e6158affa736ac629082501f0d84eabde3fb5c;hp=5b24fbf37c8a3d4d94db2870a74cdc381d33f06e;hb=b2169e5f4cbd3ce724c4808b62ddc2b8941219a5;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49 diff --git a/src/common/network.h b/src/common/network.h index 5b24fbf3..01e6158a 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2014 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -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 {