From 04fe2988f53fc8685655d3ecc77015635e4bfdea Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 5 Dec 2019 18:50:31 -0800
Subject: [PATCH] Working

---
 .../src/scripting/ScreenshareScriptingInterface.cpp    |  3 ++-
 .../src/scripting/ScreenshareScriptingInterface.h      |  4 ++--
 libraries/networking/src/AccountManager.cpp            | 10 ----------
 libraries/networking/src/AccountManager.h              |  6 +++---
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/interface/src/scripting/ScreenshareScriptingInterface.cpp b/interface/src/scripting/ScreenshareScriptingInterface.cpp
index a5f7595599..1e03e90482 100644
--- a/interface/src/scripting/ScreenshareScriptingInterface.cpp
+++ b/interface/src/scripting/ScreenshareScriptingInterface.cpp
@@ -18,6 +18,7 @@
 #include <AccountManager.h>
 #include <AddressManager.h>
 #include <DependencyManager.h>
+#include <NodeList.h>
 #include <UUID.h>
 
 #include "EntityScriptingInterface.h"
@@ -47,7 +48,7 @@ ScreenshareScriptingInterface::~ScreenshareScriptingInterface() {
     stopScreenshare();
 }
 
-void ScreenshareScriptingInterface::processAvatarZonePresencePacketOnClient(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
+void ScreenshareScriptingInterface::processAvatarZonePresencePacketOnClient(QSharedPointer<ReceivedMessage> message) {
     QUuid zone = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
 
     if (zone.isNull()) {
diff --git a/interface/src/scripting/ScreenshareScriptingInterface.h b/interface/src/scripting/ScreenshareScriptingInterface.h
index 41e93d770d..ec8f3cd619 100644
--- a/interface/src/scripting/ScreenshareScriptingInterface.h
+++ b/interface/src/scripting/ScreenshareScriptingInterface.h
@@ -18,6 +18,7 @@
 #include <QNetworkReply>
 
 #include <PathUtils.h>
+#include <ReceivedMessage.h>
 
 class ScreenshareScriptingInterface : public QObject, public Dependency {
     Q_OBJECT
@@ -36,13 +37,12 @@ signals:
     void localWebEntityZOffsetChanged(const float& newZOffset);
 
 private slots:
+    void processAvatarZonePresencePacketOnClient(QSharedPointer<ReceivedMessage> message);
     void onWebEventReceived(const QUuid& entityID, const QVariant& message);
     void handleSuccessfulScreenshareInfoGet(QNetworkReply* reply);
     void handleFailedScreenshareInfoGet(QNetworkReply* reply);
 
 private:
-    void processAvatarZonePresencePacketOnClient(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
-
 #if DEV_BUILD
 #ifdef Q_OS_WIN
     const QString SCREENSHARE_EXE_PATH{ PathUtils::projectRootPath() + "/screenshare/hifi-screenshare-win32-x64/hifi-screenshare.exe" };
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index 095dfebf5c..83c0fd28dd 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -51,16 +51,6 @@ const int POST_SETTINGS_INTERVAL = 10 * MSECS_PER_SECOND;
 const int PULL_SETTINGS_RETRY_INTERVAL = 2 * MSECS_PER_SECOND;
 const int MAX_PULL_RETRIES = 10;
 
-JSONCallbackParameters::JSONCallbackParameters(QObject* callbackReceiver,
-                                               const QString& jsonCallbackMethod,
-                                               const QString& errorCallbackMethod) :
-    callbackReceiver(callbackReceiver),
-    jsonCallbackMethod(jsonCallbackMethod),
-    errorCallbackMethod(errorCallbackMethod)
-{
-
-}
-
 JSONCallbackParameters::JSONCallbackParameters(QObject* callbackReceiver,
     const QString& jsonCallbackMethod,
     const QString& errorCallbackMethod,
diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h
index 33c9190561..7dc4d0dc13 100644
--- a/libraries/networking/src/AccountManager.h
+++ b/libraries/networking/src/AccountManager.h
@@ -30,9 +30,9 @@
 class JSONCallbackParameters {
 public:
     JSONCallbackParameters(QObject* callbackReceiver = nullptr,
-                           const QString& jsonCallbackMethod = QString(),
-                           const QString& errorCallbackMethod = QString(),
-                           const QJsonObject& callbackData = QJsonObject());
+        const QString& jsonCallbackMethod = QString(),
+        const QString& errorCallbackMethod = QString(),
+        const QJsonObject& callbackData = QJsonObject());
 
     bool isEmpty() const { return !callbackReceiver; }