X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=a64fb08860fc1440d679aeba954504599bc8604b;hp=6c2ff4039af7614cc98e9e726d152b3b9d9afe99;hb=3361bcc5945293951a62ebd2fb2a21f3b90bd115;hpb=dd2b40bf10da0309a72a9b2e8f49af752646fd92 diff --git a/src/common/network.h b/src/common/network.h index 6c2ff403..a64fb088 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -141,7 +141,9 @@ public: void setCodecForDecoding(QTextCodec *codec); QString decodeString(const QByteArray &text) const; - QByteArray encodeString(const QString string) const; + QByteArray encodeString(const QString &string) const; + QString decodeServerString(const QByteArray &text) const; + QByteArray encodeServerString(const QString &string) const; static QByteArray defaultCodecForServer(); static QByteArray defaultCodecForEncoding(); @@ -262,6 +264,8 @@ signals: void disconnectRequested(NetworkId id = 0) const; private: + QPointer _proxy; + NetworkId _networkId; IdentityId _identity; @@ -292,7 +296,6 @@ private: bool _unlimitedReconnectRetries; bool _rejoinChannels; - QPointer _proxy; void determinePrefixes(); QTextCodec *_codecForServer;