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

Use traditional C strings rather than raw strings

Browse source
This commit is contained in:
Simon Walton 2018-11-13 13:33:36 -08:00
parent df2bc6ba5c
commit a65466f154
2 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libraries/octree/src/Octree.cpp
View file

@ -904,9 +904,7 @@ bool Octree::toJSONString(QString& jsonString, const OctreeElementPointer& eleme
top = _rootElement; top = _rootElement;
} }
jsonString += QString(R"({ jsonString += QString("{\n \"DataVersion\": %1,\n \"Entities\": [").arg(_persistDataVersion);
"DataVersion": %1,
"Entities": [)").arg(_persistDataVersion);
writeToJSON(jsonString, top); writeToJSON(jsonString, top);
@ -914,12 +912,7 @@ bool Octree::toJSONString(QString& jsonString, const OctreeElementPointer& eleme
PacketType expectedType = expectedDataPacketType(); PacketType expectedType = expectedDataPacketType();
PacketVersion expectedVersion = versionForPacketType(expectedType); PacketVersion expectedVersion = versionForPacketType(expectedType);
jsonString += QString(R"( jsonString += QString("\n ],\n \"Id\": \"%1\",\n \"Version\": %2\n}\n").arg(_persistID.toString()).arg((int)expectedVersion);
],
"Id": "%1",
"Version": %2
}
)").arg(_persistID.toString()).arg((int)expectedVersion);
return true; return true;
} }

9
libraries/octree/src/OctreeDataUtils.cpp
View file

@ -63,16 +63,11 @@ bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromFile(QString path) {
QByteArray OctreeUtils::RawOctreeData::toByteArray() { QByteArray OctreeUtils::RawOctreeData::toByteArray() {
QByteArray jsonString; QByteArray jsonString;
jsonString += QString(R"({ jsonString += QString("{\n \"DataVersion\": %1,\n").arg(dataVersion);
"DataVersion": %1,
)").arg(dataVersion);
writeSubclassData(jsonString); writeSubclassData(jsonString);
jsonString += QString(R"(, jsonString += QString(",\n \"Id\": \"%1\",\n \"Version\": %2\n}").arg(id.toString()).arg(version);
"Id": "%1",
"Version": %2
})").arg(id.toString()).arg(version);
return jsonString; return jsonString;
} }