From 028935f831070a33f727d2fe96f60a3b632627ab Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 6 Oct 2015 20:03:46 -0700
Subject: [PATCH] Removing deprecated function usage

---
 interface/src/Application.cpp                     | 1 -
 interface/src/avatar/MyAvatar.cpp                 | 6 +++---
 interface/src/scripting/HMDScriptingInterface.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index fa9b9f52b2..3a9b4dba52 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -281,7 +281,6 @@ bool setupEssentials(int& argc, char** argv) {
     Setting::init();
 
     // Set dependencies
-<<<<<<< HEAD
     DependencyManager::set<AddressManager>();
     DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
     DependencyManager::set<GeometryCache>();
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 322c83fcc0..7592aad061 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1342,11 +1342,11 @@ void MyAvatar::renderBody(RenderArgs* renderArgs, ViewFrustum* renderFrustum, fl
     if (qApp->isHMDMode()) {
         glm::vec3 cameraPosition = qApp->getCamera()->getPosition();
 
-        glm::mat4 headPose = Application::getInstance()->getActiveDisplayPlugin()->getHeadPose();
-        glm::mat4 leftEyePose = Application::getInstance()->getActiveDisplayPlugin()->getEyeToHeadTransform(Eye::Left);
+        glm::mat4 headPose = qApp->getActiveDisplayPlugin()->getHeadPose();
+        glm::mat4 leftEyePose = qApp->getActiveDisplayPlugin()->getEyeToHeadTransform(Eye::Left);
         leftEyePose = leftEyePose * headPose;
         glm::vec3 leftEyePosition = glm::vec3(leftEyePose[3]);
-        glm::mat4 rightEyePose = Application::getInstance()->getActiveDisplayPlugin()->getEyeToHeadTransform(Eye::Right);
+        glm::mat4 rightEyePose = qApp->getActiveDisplayPlugin()->getEyeToHeadTransform(Eye::Right);
         rightEyePose = rightEyePose * headPose;
         glm::vec3 rightEyePosition = glm::vec3(rightEyePose[3]);
         glm::vec3 headPosition = glm::vec3(headPose[3]);
diff --git a/interface/src/scripting/HMDScriptingInterface.cpp b/interface/src/scripting/HMDScriptingInterface.cpp
index f6bf7f8b3c..3d39bdd143 100644
--- a/interface/src/scripting/HMDScriptingInterface.cpp
+++ b/interface/src/scripting/HMDScriptingInterface.cpp
@@ -29,7 +29,7 @@ QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* conte
         glm::vec3 direction = glm::inverse(myAvatar->getOrientation()) * (hudIntersection - sphereCenter);
         glm::quat rotation = ::rotationBetween(glm::vec3(0.0f, 0.0f, -1.0f), direction);
         glm::vec3 eulers = ::safeEulerAngles(rotation);
-        return qScriptValueFromValue<glm::vec2>(engine, Application::getInstance()->getApplicationCompositor()
+        return qScriptValueFromValue<glm::vec2>(engine, qApp->getApplicationCompositor()
             .sphericalToOverlay(glm::vec2(eulers.y, -eulers.x)));
     }
     return QScriptValue::NullValue;
@@ -49,17 +49,17 @@ void HMDScriptingInterface::toggleMagnifier() {
 }
 
 bool HMDScriptingInterface::getMagnifier() const {
-    return Application::getInstance()->getApplicationCompositor().hasMagnifier();
+    return qApp->getApplicationCompositor().hasMagnifier();
 }
 
 bool HMDScriptingInterface::getHUDLookAtPosition3D(glm::vec3& result) const {
-    Camera* camera = Application::getInstance()->getCamera();
+    Camera* camera = qApp->getCamera();
     glm::vec3 position = camera->getPosition();
     glm::quat orientation = camera->getOrientation();
 
     glm::vec3 direction = orientation * glm::vec3(0.0f, 0.0f, -1.0f);
 
-    const auto& compositor = Application::getInstance()->getApplicationCompositor();
+    const auto& compositor = qApp->getApplicationCompositor();
 
     return compositor.calculateRayUICollisionPoint(position, direction, result);
 }