From 8a8830bbd43f30dc7accfce81134967b710ce457 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 26 Feb 2018 17:06:25 -0800 Subject: [PATCH] Fix writeSubclassData in octree data --- libraries/octree/src/OctreeDataUtils.cpp | 4 ++-- libraries/octree/src/OctreeDataUtils.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/octree/src/OctreeDataUtils.cpp b/libraries/octree/src/OctreeDataUtils.cpp index 9c965a128b..b57ab8db31 100644 --- a/libraries/octree/src/OctreeDataUtils.cpp +++ b/libraries/octree/src/OctreeDataUtils.cpp @@ -115,13 +115,13 @@ void OctreeUtils::RawOctreeData::resetIdAndVersion() { qDebug() << "Reset octree data to: " << id << version; } -void OctreeUtils::RawEntityData::readSubclassData(QJsonObject root) { +void OctreeUtils::RawEntityData::readSubclassData(const QJsonObject& root) { if (root.contains("Entities")) { entityData = root["Entities"].toArray(); } } -void OctreeUtils::RawEntityData::writeSubclassData(QJsonObject root) const { +void OctreeUtils::RawEntityData::writeSubclassData(QJsonObject& root) const { root["Entities"] = entityData; } diff --git a/libraries/octree/src/OctreeDataUtils.h b/libraries/octree/src/OctreeDataUtils.h index ba70f3d079..485599096d 100644 --- a/libraries/octree/src/OctreeDataUtils.h +++ b/libraries/octree/src/OctreeDataUtils.h @@ -32,8 +32,8 @@ public: virtual PacketType dataPacketType() const; - virtual void readSubclassData(QJsonObject root) { } - virtual void writeSubclassData(QJsonObject root) const { } + virtual void readSubclassData(const QJsonObject& root) { } + virtual void writeSubclassData(QJsonObject& root) const { } void resetIdAndVersion(); QByteArray toByteArray(); @@ -46,8 +46,8 @@ public: class RawEntityData : public RawOctreeData { PacketType dataPacketType() const override; - void readSubclassData(QJsonObject root) override; - void writeSubclassData(QJsonObject root) const override; + void readSubclassData(const QJsonObject& root) override; + void writeSubclassData(QJsonObject& root) const override; QJsonArray entityData; };