X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fglobal.cpp;h=cbde79cd4c9cffced532979280ae60a08785b8e5;hp=a0c94bb36a4592b9d40bf1df25a1ca6e07fa1ec1;hb=2039f5e28eeb431e394f1c2468a26218bd926538;hpb=f53a40aa9d3e0f2c1f15191b665780595d52348a diff --git a/src/common/global.cpp b/src/common/global.cpp index a0c94bb3..cbde79cd 100644 --- a/src/common/global.cpp +++ b/src/common/global.cpp @@ -48,8 +48,6 @@ void Global::initIconMap() { /**************************************************************************************/ - - BufferId::BufferId(uint _id, QString _net, QString _buf, uint _gid) : id(_id), gid(_gid), net(_net), buf(_buf) { @@ -62,14 +60,15 @@ QString BufferId::buffer() const { QDataStream &operator<<(QDataStream &out, const BufferId &bufferId) { out << bufferId.id << bufferId.gid << bufferId.net.toUtf8() << bufferId.buf.toUtf8(); + return out; } QDataStream &operator>>(QDataStream &in, BufferId &bufferId) { QByteArray n, b; - BufferId i; in >> bufferId.id >> bufferId.gid >> n >> b; bufferId.net = QString::fromUtf8(n); bufferId.buf = QString::fromUtf8(b); + return in; } uint qHash(const BufferId &bid) {