Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 15:38:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Transmit octree string parameters as utf-8 strings

Browse source
This commit is contained in:
David Kelly 2019-01-25 08:43:56 -07:00
parent 66d5b16a5d
commit 05d56a5fe9
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/octree/src/OctreePacketData.cpp Normal file → Executable file
View file

@ -506,10 +506,11 @@ bool OctreePacketData::appendValue(bool value) {
bool OctreePacketData::appendValue(const QString& string) {
// TODO: make this a ByteCountCoded leading byte
uint16_t length = string.size() + 1; // include NULL
QByteArray utf8Array = string.toUtf8();
uint16_t length = utf8Array.length(); // no NULL
bool success = appendValue(length);
if (success) {
success = appendRawData((const unsigned char*)qPrintable(string), length);
success = appendRawData((const unsigned char*)utf8Array.constData(), length);
}
return success;
}
@ -706,7 +707,7 @@ int OctreePacketData::unpackDataFromBytes(const unsigned char* dataBytes, QStrin
uint16_t length;
memcpy(&length, dataBytes, sizeof(length));
dataBytes += sizeof(length);
QString value((const char*)dataBytes);
QString value = QString::fromUtf8((const char*)dataBytes, length);
result = value;
return sizeof(length) + length;
}