From fb7f6df694ccfc6e856a33a8cc3c5189f3387203 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Sun, 22 Oct 2017 11:40:41 -0700
Subject: [PATCH] CR feedback

---
 assignment-client/src/scripts/EntityScriptServer.cpp | 10 ++--------
 libraries/networking/src/EntityScriptClient.cpp      | 10 ++--------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index 2e74e889a6..c40ff3ba86 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -237,20 +237,14 @@ void EntityScriptServer::handleEntityScriptCallMethodPacket(QSharedPointer<Recei
     if (_entitiesScriptEngine && _entityViewer.getTree() && !_shuttingDown) {
         auto entityID = QUuid::fromRfc4122(receivedMessage->read(NUM_BYTES_RFC4122_UUID));
 
-        quint16 methodLength;
-        receivedMessage->readPrimitive(&methodLength);
-        auto methodData = receivedMessage->read(methodLength);
-        auto method = QString::fromUtf8(methodData);
+        auto method = receivedMessage->readString();
 
         quint16 paramCount;
         receivedMessage->readPrimitive(&paramCount);
 
         QStringList params;
         for (int param = 0; param < paramCount; param++) {
-            quint16 paramLength;
-            receivedMessage->readPrimitive(&paramLength);
-            auto paramData = receivedMessage->read(paramLength);
-            auto paramString = QString::fromUtf8(paramData);
+            auto paramString = receivedMessage->readString();
             params << paramString;
         }
 
diff --git a/libraries/networking/src/EntityScriptClient.cpp b/libraries/networking/src/EntityScriptClient.cpp
index 2d47b8d8a3..399cb80bfa 100644
--- a/libraries/networking/src/EntityScriptClient.cpp
+++ b/libraries/networking/src/EntityScriptClient.cpp
@@ -79,19 +79,13 @@ void EntityScriptClient::callEntityServerMethod(QUuid entityID, const QString& m
 
         packetList->write(entityID.toRfc4122());
 
-        auto methodUtf8 = method.toUtf8();
-        quint16 methodLength = methodUtf8.length();
-        packetList->writePrimitive(methodLength);
-        packetList->write(methodUtf8);
+        packetList->writeString(method);
 
         quint16 paramCount = params.length();
         packetList->writePrimitive(paramCount);
 
         foreach(const QString& param, params) {
-            auto paramUtf8 = param.toUtf8();
-            quint16 paramLength = paramUtf8.length();
-            packetList->writePrimitive(paramLength);
-            packetList->write(paramUtf8);
+            packetList->writeString(param);
         }
 
         nodeList->sendPacketList(std::move(packetList), *entityScriptServer);