From 44c9d4a742a9868a962ce786ef9c47a0f1e9c840 Mon Sep 17 00:00:00 2001
From: Bradley Austin Davis <bdavis@saintandreas.org>
Date: Thu, 2 Apr 2015 16:12:44 -0700
Subject: [PATCH] Working on removing some of the warnings in the xcode build

---
 interface/src/Application.cpp                      | 4 ++--
 interface/src/devices/OculusManager.cpp            | 3 +--
 libraries/networking/src/DataServerAccountInfo.cpp | 1 +
 libraries/networking/src/RSAKeypairGenerator.cpp   | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index a8f9efd672..f0324b7361 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -268,6 +268,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
         _dependencyManagerIsSetup(setupEssentials(argc, argv)),
         _window(new MainWindow(desktop())),
         _toolWindow(NULL),
+        _friendsWindow(NULL),
         _datagramProcessor(),
         _undoStack(),
         _undoStackScriptingInterface(&_undoStack),
@@ -309,8 +310,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
         _isVSyncOn(true),
         _aboutToQuit(false),
         _notifiedPacketVersionMismatchThisDomain(false),
-        _domainConnectionRefusals(QList<QString>()),
-        _friendsWindow(NULL)
+        _domainConnectionRefusals(QList<QString>())
 {
 #ifdef Q_OS_WIN
     installNativeEventFilter(&MyNativeEventFilter::getInstance());
diff --git a/interface/src/devices/OculusManager.cpp b/interface/src/devices/OculusManager.cpp
index db10298583..5fbd0b6a0b 100644
--- a/interface/src/devices/OculusManager.cpp
+++ b/interface/src/devices/OculusManager.cpp
@@ -443,7 +443,6 @@ void OculusManager::configureCamera(Camera& camera, int screenWidth, int screenH
     camera.setFieldOfView(atan(_eyeFov[0].UpTan) * DEGREES_PER_RADIAN * 2.0f);
 }
 
-static bool timerActive = false;
 //Displays everything for the oculus, frame timing must be active
 void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &position, Camera& whichCamera) {
     auto glCanvas = Application::getInstance()->getGLWidget();
@@ -463,6 +462,7 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
     // (does not seem to work on OSX with SDK based distortion)
     // FIXME can't use a static object here, because it will cause a crash when the
     // query attempts deconstruct after the GL context is gone.
+    static bool timerActive = false;
     static QOpenGLTimerQuery timerQuery;
     if (!timerQuery.isCreated()) {
         timerQuery.create();
@@ -671,7 +671,6 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
 #endif
 
     // No DK2, no message.
-    char latency2Text[128] = "";
     {
         float latencies[5] = {};
         if (debugFrame && ovrHmd_GetFloatArray(_ovrHmd, "DK2Latency", latencies, 5) == 5)
diff --git a/libraries/networking/src/DataServerAccountInfo.cpp b/libraries/networking/src/DataServerAccountInfo.cpp
index 9b513c96f1..00ef0f9e1d 100644
--- a/libraries/networking/src/DataServerAccountInfo.cpp
+++ b/libraries/networking/src/DataServerAccountInfo.cpp
@@ -15,6 +15,7 @@
 #include <QtCore/QDebug>
 
 #include "DataServerAccountInfo.h"
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
 DataServerAccountInfo::DataServerAccountInfo() :
     _accessToken(),
diff --git a/libraries/networking/src/RSAKeypairGenerator.cpp b/libraries/networking/src/RSAKeypairGenerator.cpp
index a51a17c0ca..bfe16cc9b8 100644
--- a/libraries/networking/src/RSAKeypairGenerator.cpp
+++ b/libraries/networking/src/RSAKeypairGenerator.cpp
@@ -16,6 +16,7 @@
 #include <qdebug.h>
 
 #include "RSAKeypairGenerator.h"
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
 RSAKeypairGenerator::RSAKeypairGenerator(QObject* parent) :
     QObject(parent)