X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=dbc5f35faf8bd23be60688b5e56990e7aade38f7;hp=d94502ee0730b1b5ecbf7b4225817b55c8e67fc3;hb=efe20e20080a0c22e1a7b8b84ef622130dbf116e;hpb=257ca0d5f944a8f63d002e1dcaaa3902258d85e0 diff --git a/src/common/network.h b/src/common/network.h index d94502ee..dbc5f35f 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -88,7 +88,7 @@ public: D_CHANMODE = 0x08 }; - + Network(const NetworkId &networkid, QObject *parent = 0); ~Network(); @@ -113,11 +113,11 @@ public: ChannelModeType channelModeType(const QString &mode); inline ChannelModeType channelModeType(const QCharRef &mode) { return channelModeType(QString(mode)); } - + inline const QString &networkName() const { return _networkName; } inline const QString ¤tServer() const { return _currentServer; } inline const QString &myNick() const { return _myNick; } - inline const int latency() const { return _latency; } + inline int latency() const { return _latency; } inline IrcUser *me() const { return ircUser(myNick()); } inline IdentityId identity() const { return _identity; } QStringList nicks() const; @@ -216,14 +216,14 @@ public slots: virtual QVariantMap initIrcUsersAndChannels() const; // QStringList initIrcUsers() const; // QStringList initIrcChannels() const; - + //init seters void initSetSupports(const QVariantMap &supports); inline void initSetServerList(const QVariantList &serverList) { setServerList(serverList); } virtual void initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels); // void initSetIrcUsers(const QStringList &hostmasks); // void initSetIrcChannels(const QStringList &channels); - + IrcUser *updateNickFromMask(const QString &mask); // these slots are to keep the hashlists of all users and the @@ -232,6 +232,7 @@ public slots: virtual inline void requestConnect() const { emit connectRequested(); } virtual inline void requestDisconnect() const { emit disconnectRequested(); } + virtual inline void requestSetNetworkInfo(const NetworkInfo &info) { emit setNetworkInfoRequested(info); } void emitConnectionError(const QString &); @@ -292,6 +293,7 @@ signals: void connectRequested(NetworkId id = 0) const; void disconnectRequested(NetworkId id = 0) const; + void setNetworkInfoRequested(const NetworkInfo &) const; private: QPointer _proxy; @@ -373,6 +375,6 @@ QDataStream &operator<<(QDataStream &out, const NetworkInfo &info); QDataStream &operator>>(QDataStream &in, NetworkInfo &info); QDebug operator<<(QDebug dbg, const NetworkInfo &i); -Q_DECLARE_METATYPE(NetworkInfo); +Q_DECLARE_METATYPE(NetworkInfo) #endif