X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=29d57492a40b4b33dfd727bb723e149bfde04488;hb=e8903b1f19c183a537d7b31b7fd709dde1a69ef5;hp=a64fb08860fc1440d679aeba954504599bc8604b;hpb=723db5bff304ad3fdf5a0609198c65a66bfbaea7;p=quassel.git diff --git a/src/common/network.h b/src/common/network.h index a64fb088..29d57492 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -68,7 +68,7 @@ class Network : public SyncableObject { Q_PROPERTY(bool rejoinChannels READ rejoinChannels WRITE setRejoinChannels STORED false) public: - enum ConnectionState { Disconnected, Connecting, Initializing, Initialized, Disconnecting }; + enum ConnectionState { Disconnected, Connecting, Initializing, Initialized, Reconnecting, Disconnecting }; Network(const NetworkId &networkid, QObject *parent = 0); ~Network(); @@ -183,7 +183,7 @@ public slots: inline void addIrcUser(const QString &hostmask) { newIrcUser(hostmask); } void removeIrcUser(const QString &nick); void removeIrcChannel(const QString &channel); - + //init geters QVariantMap initSupports() const; QVariantList initServerList() const; @@ -194,7 +194,7 @@ public slots: void initSetSupports(const QVariantMap &supports); void initSetServerList(const QVariantList &serverList); void initSetIrcUsers(const QStringList &hostmasks); - void initSetChannels(const QStringList &channels); + void initSetIrcChannels(const QStringList &channels); IrcUser *updateNickFromMask(const QString &mask); @@ -234,7 +234,7 @@ signals: void autoIdentifyPasswordSet(const QString &); void useAutoReconnectSet(bool); void autoReconnectIntervalSet(quint32); - void autoReconnectRetriesSet(qint16); + void autoReconnectRetriesSet(quint16); void unlimitedReconnectRetriesSet(bool); void rejoinChannelsSet(bool); @@ -340,6 +340,7 @@ struct NetworkInfo { QDataStream &operator<<(QDataStream &out, const NetworkInfo &info); QDataStream &operator>>(QDataStream &in, NetworkInfo &info); +QDebug operator<<(QDebug dbg, const NetworkInfo &i); Q_DECLARE_METATYPE(NetworkInfo);