summaryrefslogtreecommitdiffstats
path: root/src/shared/networkmessage.cpp
diff options
context:
space:
mode:
authorsr2013-02-05 17:28:19 +0100
committersr2013-02-05 17:28:19 +0100
commit6f4fb557610beccb225a6bf3d46c0118b221bd99 (patch)
treefb2c7cb6cd7b09294fa3ca5cb7eef902bddac0e7 /src/shared/networkmessage.cpp
parent... (diff)
downloadpvs2-6f4fb557610beccb225a6bf3d46c0118b221bd99.tar.gz
pvs2-6f4fb557610beccb225a6bf3d46c0118b221bd99.tar.xz
pvs2-6f4fb557610beccb225a6bf3d46c0118b221bd99.zip
[SERVER] Implement all four VNC projection modes
Diffstat (limited to 'src/shared/networkmessage.cpp')
-rw-r--r--src/shared/networkmessage.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/networkmessage.cpp b/src/shared/networkmessage.cpp
index 9a7ba9f..f7972f0 100644
--- a/src/shared/networkmessage.cpp
+++ b/src/shared/networkmessage.cpp
@@ -190,7 +190,7 @@ bool NetworkMessage::parseMessage(char *buffer)
<< ") length > total remaining bytes (" << (_bufferSize - (ptr - buffer)) << ")";
return false;
}
- _fields.insert(QString::fromUtf8(ptr, keyLen), QByteArray(ptr + keyLen, valLen));
+ _fields.insert(QByteArray(ptr, keyLen), QByteArray(ptr + keyLen, valLen));
//qDebug() << "Got " << QString::fromUtf8(ptr, keyLen) << " -> " << QString::fromUtf8(ptr + keyLen, valLen);
ptr += keyLen + valLen;
}
@@ -260,9 +260,9 @@ void NetworkMessage::serializeMessage()
QByteArray buf;
//qDebug() << "Default size: " << buf.capacity();
buf.reserve(_lastBufferSize > 0 ? _lastBufferSize : 200);
- for (QHash<QString, QByteArray>::const_iterator it = _fields.begin(); it != _fields.end(); ++it)
+ for (QHash<QByteArray, QByteArray>::const_iterator it = _fields.begin(); it != _fields.end(); ++it)
{
- const QByteArray &ba = it.key().toUtf8();
+ const QByteArray &ba = it.key();
const QByteArray &val = it.value();
quint16 keyLen = _htons((quint16)ba.size());
quint16 valLen = _htons((quint16)val.size());