From 465f5c6789e42b7c2df696c6e5a34a6aeea215f5 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 19 Jan 2017 15:09:16 -0800
Subject: [PATCH] Add getters to ScriptStatusRequest

---
 libraries/entities/src/EntityScriptingInterface.cpp |  4 ++--
 libraries/networking/src/EntityScriptClient.cpp     |  8 ++++----
 libraries/networking/src/EntityScriptClient.h       | 13 +++++++++----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index ea02a2d5fa..26754335a0 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -681,7 +681,7 @@ bool EntityScriptingInterface::getServerScriptStatus(QUuid entityID, QScriptValu
     auto request = client->createScriptStatusRequest(entityID);
     connect(request, &GetScriptStatusRequest::finished, callback.engine(), [callback](GetScriptStatusRequest* request) mutable {
         QString statusString;
-        switch (request->status) {
+        switch (request->getStatus()) {
             case RUNNING:
                 statusString = "running";
                 break;
@@ -695,7 +695,7 @@ bool EntityScriptingInterface::getServerScriptStatus(QUuid entityID, QScriptValu
                 statusString = "";
                 break;
         }
-        QScriptValueList args { request->responseReceived, request->isRunning, statusString, request->errorInfo };
+        QScriptValueList args { request->getResponseReceived(), request->getIsRunning(), statusString, request->getErrorInfo() };
         callback.call(QScriptValue(), args);
         request->deleteLater();
     });
diff --git a/libraries/networking/src/EntityScriptClient.cpp b/libraries/networking/src/EntityScriptClient.cpp
index b844cf4cf3..0e6cbed46d 100644
--- a/libraries/networking/src/EntityScriptClient.cpp
+++ b/libraries/networking/src/EntityScriptClient.cpp
@@ -17,10 +17,10 @@ GetScriptStatusRequest::~GetScriptStatusRequest() {
 void GetScriptStatusRequest::start() {
     auto client = DependencyManager::get<EntityScriptClient>();
     client->getEntityServerScriptStatus(_entityID, [this](bool responseReceived, bool isRunning, EntityScriptStatus status, QString errorInfo) {
-        this->responseReceived = responseReceived;
-        this->isRunning = isRunning;
-        this->status = status;
-        this->errorInfo = errorInfo;
+        responseReceived = responseReceived;
+        isRunning = isRunning;
+        status = status;
+        errorInfo = errorInfo;
 
         emit finished(this);
     });
diff --git a/libraries/networking/src/EntityScriptClient.h b/libraries/networking/src/EntityScriptClient.h
index c75f930f96..f32d78a6dd 100644
--- a/libraries/networking/src/EntityScriptClient.h
+++ b/libraries/networking/src/EntityScriptClient.h
@@ -32,10 +32,10 @@ public:
 
     Q_INVOKABLE void start();
 
-    bool responseReceived;
-    bool isRunning;
-    EntityScriptStatus status;
-    QString errorInfo;
+    bool getResponseReceived() const { return _responseReceived; }
+    bool getIsRunning() const { return _isRunning; }
+    EntityScriptStatus getStatus() const { return _status; }
+    QString getErrorInfo() const { return _errorInfo;  }
 
 signals:
     void finished(GetScriptStatusRequest* request);
@@ -43,6 +43,11 @@ signals:
 private:
     QUuid _entityID;
     MessageID _messageID;
+
+    bool _responseReceived;
+    bool _isRunning;
+    EntityScriptStatus _status;
+    QString _errorInfo;
 };
 
 class EntityScriptClient : public QObject, public Dependency {