From eb0f7da5172da308bf76534565024b799fe6bcc0 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 22 Sep 2014 16:14:06 -0700
Subject: [PATCH] cleanup to snapshot class to reduce passing of variables

---
 interface/src/Application.cpp                |  2 +-
 interface/src/location/LocationManager.cpp   |  6 ++----
 interface/src/ui/Snapshot.cpp                | 14 +++++++++-----
 interface/src/ui/Snapshot.h                  |  7 ++++---
 libraries/networking/src/LimitedNodeList.cpp |  2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index a20a6553d4..1d44e91120 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4158,7 +4158,7 @@ void Application::takeSnapshot() {
     player->setMedia(QUrl::fromLocalFile(inf.absoluteFilePath()));
     player->play();
 
-    QString fileName = Snapshot::saveSnapshot(_glWidget, _myAvatar);
+    QString fileName = Snapshot::saveSnapshot();
 
     AccountManager& accountManager = AccountManager::getInstance();
     if (!accountManager.isLoggedIn()) {
diff --git a/interface/src/location/LocationManager.cpp b/interface/src/location/LocationManager.cpp
index ed27d9e49d..9b5dfa440f 100644
--- a/interface/src/location/LocationManager.cpp
+++ b/interface/src/location/LocationManager.cpp
@@ -101,10 +101,8 @@ void LocationManager::locationImageUpdateSuccess(const QJsonObject& rootObject)
 }
 
 void LocationManager::updateSnapshotForExistingLocation(const QString& locationID) {
-    // first create a snapshot and save it
-    Application* application = Application::getInstance();
-    
-    QTemporaryFile* tempImageFile = Snapshot::saveTempSnapshot(application->getGLWidget(), application->getAvatar());
+    // first create a snapshot and save it    
+    QTemporaryFile* tempImageFile = Snapshot::saveTempSnapshot();
     
     if (tempImageFile && tempImageFile->open()) {
         AccountManager& accountManager = AccountManager::getInstance();
diff --git a/interface/src/ui/Snapshot.cpp b/interface/src/ui/Snapshot.cpp
index 9fe1c332be..d68920a5f5 100644
--- a/interface/src/ui/Snapshot.cpp
+++ b/interface/src/ui/Snapshot.cpp
@@ -64,8 +64,8 @@ SnapshotMetaData* Snapshot::parseSnapshotData(QString snapshotPath) {
     return data;
 }
 
-QString Snapshot::saveSnapshot(QGLWidget* widget, Avatar* avatar) {
-    QFile* snapshotFile = savedFileForSnapshot(widget, avatar, false);
+QString Snapshot::saveSnapshot() {
+    QFile* snapshotFile = savedFileForSnapshot(false);
     
     // we don't need the snapshot file, so close it, grab its filename and delete it
     snapshotFile->close();
@@ -77,14 +77,18 @@ QString Snapshot::saveSnapshot(QGLWidget* widget, Avatar* avatar) {
     return snapshotPath;
 }
 
-QTemporaryFile* Snapshot::saveTempSnapshot(QGLWidget* widget, Avatar* avatar) {
+QTemporaryFile* Snapshot::saveTempSnapshot() {
     // return whatever we get back from saved file for snapshot
-    return static_cast<QTemporaryFile*>(savedFileForSnapshot(widget, avatar, true));;
+    return static_cast<QTemporaryFile*>(savedFileForSnapshot(true));;
 }
 
-QFile* Snapshot::savedFileForSnapshot(QGLWidget* widget, Avatar* avatar, bool isTemporary) {
+QFile* Snapshot::savedFileForSnapshot(bool isTemporary) {
+    
+    QGLWidget* widget =  Application::getInstance()->getGLWidget();
     QImage shot = widget->grabFrameBuffer();
     
+    Avatar* avatar = Application::getInstance()->getAvatar();
+    
     glm::vec3 location = avatar->getPosition();
     glm::quat orientation = avatar->getHead()->getOrientation();
     
diff --git a/interface/src/ui/Snapshot.h b/interface/src/ui/Snapshot.h
index 8f15532cb5..502bc39157 100644
--- a/interface/src/ui/Snapshot.h
+++ b/interface/src/ui/Snapshot.h
@@ -15,6 +15,7 @@
 #include "InterfaceConfig.h"
 
 #include <QImage>
+#include <QFile>
 #include <QGLWidget>
 #include <QString>
 
@@ -41,12 +42,12 @@ private:
 class Snapshot {
 
 public:
-    static QString saveSnapshot(QGLWidget* widget, Avatar* avatar);
-    static QTemporaryFile* saveTempSnapshot(QGLWidget* widget, Avatar* avatar);
+    static QString saveSnapshot();
+    static QTemporaryFile* saveTempSnapshot();
     static SnapshotMetaData* parseSnapshotData(QString snapshotPath);
     
 private:
-    static QFile* savedFileForSnapshot(QGLWidget* widget, Avatar* avatar, bool isTemporary);
+    static QFile* savedFileForSnapshot(bool isTemporary);
 };
 
 #endif // hifi_Snapshot_h
diff --git a/libraries/networking/src/LimitedNodeList.cpp b/libraries/networking/src/LimitedNodeList.cpp
index d42cab6210..bfdfc28d5e 100644
--- a/libraries/networking/src/LimitedNodeList.cpp
+++ b/libraries/networking/src/LimitedNodeList.cpp
@@ -33,7 +33,7 @@ const char SOLO_NODE_TYPES[2] = {
     NodeType::AudioMixer
 };
 
-const QUrl DEFAULT_NODE_AUTH_URL = QUrl("https://data.highfidelity.io");
+const QUrl DEFAULT_NODE_AUTH_URL = QUrl("http://localhost:3000");
 
 LimitedNodeList* LimitedNodeList::_sharedInstance = NULL;