From 0f18db886c45e7f65bd953ee84b7a079c41ef80f Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 24 Sep 2015 17:19:50 +0200
Subject: [PATCH] Remove 4 Application static methods

- Replace by lambda
- Cleaned up global scope
---
 interface/src/Application.cpp             | 8 ++++----
 interface/src/Application.h               | 4 ----
 libraries/audio-client/src/AudioClient.h  | 4 ++--
 libraries/networking/src/AddressManager.h | 9 ++++-----
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 5b21f6bc39..88dae16ee2 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -432,8 +432,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
 
     auto audioIO = DependencyManager::get<AudioClient>();
 
-    audioIO->setPositionGetter(getPositionForAudio);
-    audioIO->setOrientationGetter(getOrientationForAudio);
+    audioIO->setPositionGetter([]{ return qApp->_myAvatar->getPositionForAudio(); });
+    audioIO->setOrientationGetter([]{ return qApp->_myAvatar->getOrientationForAudio(); });
 
     audioIO->moveToThread(audioThread);
 
@@ -524,8 +524,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
     auto addressManager = DependencyManager::get<AddressManager>();
 
     // use our MyAvatar position and quat for address manager path
-    addressManager->setPositionGetter(getPositionForPath);
-    addressManager->setOrientationGetter(getOrientationForPath);
+    addressManager->setPositionGetter([]{ return qApp->_myAvatar->getPosition(); });
+    addressManager->setOrientationGetter([]{ return qApp->_myAvatar->getOrientation(); });
 
     connect(addressManager.data(), &AddressManager::hostChanged, this, &Application::updateWindowTitle);
     connect(this, &QCoreApplication::aboutToQuit, addressManager.data(), &AddressManager::storeCurrentAddress);
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 883f2dd30e..799ec30471 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -139,10 +139,6 @@ class Application : public QApplication, public AbstractViewStateInterface, publ
     friend class DatagramProcessor;
 
 public:
-    static const glm::vec3& getPositionForPath() { return qApp->_myAvatar->getPosition(); }
-    static glm::quat getOrientationForPath() { return qApp->_myAvatar->getOrientation(); }
-    static glm::vec3 getPositionForAudio() { return qApp->_myAvatar->getPositionForAudio(); }
-    static glm::quat getOrientationForAudio() { return qApp->_myAvatar->getOrientationForAudio(); }
     static void initPlugins();
     static void shutdownPlugins();
 
diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h
index 1ef56649fa..e699ee9266 100644
--- a/libraries/audio-client/src/AudioClient.h
+++ b/libraries/audio-client/src/AudioClient.h
@@ -76,8 +76,6 @@ class QIODevice;
 
 typedef struct ty_gverb ty_gverb;
 
-typedef glm::vec3 (*AudioPositionGetter)();
-typedef glm::quat (*AudioOrientationGetter)();
 
 class NLPacket;
 
@@ -85,6 +83,8 @@ class AudioClient : public AbstractAudioInterface, public Dependency {
     Q_OBJECT
     SINGLETON_DEPENDENCY
 public:
+    using AudioPositionGetter = std::function<glm::vec3()>;
+    using AudioOrientationGetter = std::function<glm::quat()>;
 
     class AudioOutputIODevice : public QIODevice {
     public:
diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h
index fbb895795b..e0b54e4072 100644
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@@ -28,9 +28,6 @@ const QString INDEX_PATH = "/";
 
 const QString GET_PLACE = "/api/v1/places/%1";
 
-typedef const glm::vec3& (*PositionGetter)();
-typedef glm::quat (*OrientationGetter)();
-
 class AddressManager : public QObject, public Dependency {
     Q_OBJECT
     SINGLETON_DEPENDENCY
@@ -40,6 +37,8 @@ class AddressManager : public QObject, public Dependency {
     Q_PROPERTY(QString hostname READ getHost)
     Q_PROPERTY(QString pathname READ currentPath)
 public:
+    using PositionGetter = std::function<glm::vec3()>;
+    using OrientationGetter = std::function<glm::quat()>;
 
     enum LookupTrigger {
         UserInput,
@@ -130,8 +129,8 @@ private:
     QString _host;
     quint16 _port;
     QUuid _rootPlaceID;
-    PositionGetter _positionGetter { nullptr };
-    OrientationGetter _orientationGetter { nullptr };
+    PositionGetter _positionGetter;
+    OrientationGetter _orientationGetter;
 
     QStack<QUrl> _backStack;
     QStack<QUrl> _forwardStack;