From a65466f1546ff42a35d11e8fcc0188dfe1ebb169 Mon Sep 17 00:00:00 2001 From: Simon Walton Date: Tue, 13 Nov 2018 13:33:36 -0800 Subject: [PATCH] Use traditional C strings rather than raw strings --- libraries/octree/src/Octree.cpp | 11 ++--------- libraries/octree/src/OctreeDataUtils.cpp | 9 ++------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/libraries/octree/src/Octree.cpp b/libraries/octree/src/Octree.cpp index cfa207dbf8..c184fe122d 100644 --- a/libraries/octree/src/Octree.cpp +++ b/libraries/octree/src/Octree.cpp @@ -904,9 +904,7 @@ bool Octree::toJSONString(QString& jsonString, const OctreeElementPointer& eleme top = _rootElement; } - jsonString += QString(R"({ - "DataVersion": %1, - "Entities": [)").arg(_persistDataVersion); + jsonString += QString("{\n \"DataVersion\": %1,\n \"Entities\": [").arg(_persistDataVersion); writeToJSON(jsonString, top); @@ -914,12 +912,7 @@ bool Octree::toJSONString(QString& jsonString, const OctreeElementPointer& eleme PacketType expectedType = expectedDataPacketType(); PacketVersion expectedVersion = versionForPacketType(expectedType); - jsonString += QString(R"( - ], - "Id": "%1", - "Version": %2 -} -)").arg(_persistID.toString()).arg((int)expectedVersion); + jsonString += QString("\n ],\n \"Id\": \"%1\",\n \"Version\": %2\n}\n").arg(_persistID.toString()).arg((int)expectedVersion); return true; } diff --git a/libraries/octree/src/OctreeDataUtils.cpp b/libraries/octree/src/OctreeDataUtils.cpp index f3eed084e0..b861904255 100644 --- a/libraries/octree/src/OctreeDataUtils.cpp +++ b/libraries/octree/src/OctreeDataUtils.cpp @@ -63,16 +63,11 @@ bool OctreeUtils::RawOctreeData::readOctreeDataInfoFromFile(QString path) { QByteArray OctreeUtils::RawOctreeData::toByteArray() { QByteArray jsonString; - jsonString += QString(R"({ - "DataVersion": %1, -)").arg(dataVersion); + jsonString += QString("{\n \"DataVersion\": %1,\n").arg(dataVersion); writeSubclassData(jsonString); - jsonString += QString(R"(, - "Id": "%1", - "Version": %2 -})").arg(id.toString()).arg(version); + jsonString += QString(",\n \"Id\": \"%1\",\n \"Version\": %2\n}").arg(id.toString()).arg(version); return jsonString; }