From e4fa9e508e2e323abdb56e3c9f5f4fbfd0c62e36 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 20 Jan 2015 00:56:25 -0800
Subject: [PATCH] Moved loadSetting to MyAvatar

---
 interface/src/avatar/MyAvatar.cpp | 8 ++++++++
 libraries/shared/src/Settings.cpp | 2 +-
 libraries/shared/src/Settings.h   | 9 ---------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 4eed743375..e6d6cecd64 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -731,6 +731,14 @@ void MyAvatar::saveData(QSettings* settings) {
     settings->endGroup();
 }
 
+float loadSetting(QSettings* settings, const char* name, float defaultValue) {
+    float value = settings->value(name, defaultValue).toFloat();
+    if (glm::isnan(value)) {
+        value = defaultValue;
+    }
+    return value;
+}
+
 void MyAvatar::loadData(QSettings* settings) {
     settings->beginGroup("Avatar");
 
diff --git a/libraries/shared/src/Settings.cpp b/libraries/shared/src/Settings.cpp
index ee8cd5b40b..f57cdb7b76 100644
--- a/libraries/shared/src/Settings.cpp
+++ b/libraries/shared/src/Settings.cpp
@@ -27,4 +27,4 @@ void SettingsBridge::removeFromSettings(const QString& key) {
     QSettings().remove(key);
 }
 
-}
\ No newline at end of file
+}
diff --git a/libraries/shared/src/Settings.h b/libraries/shared/src/Settings.h
index 6a66a9a886..b0ebf4b27f 100644
--- a/libraries/shared/src/Settings.h
+++ b/libraries/shared/src/Settings.h
@@ -17,18 +17,9 @@
 #include <QVariant>
 
 // TODO: remove
-#include <glm/glm.hpp>
 class Settings : public QSettings {
     
 };
-float loadSetting(QSettings* settings, const char* name, float defaultValue) {
-    float value = settings->value(name, defaultValue).toFloat();
-    if (glm::isnan(value)) {
-        value = defaultValue;
-    }
-    return value;
-}
-////
 
 namespace SettingHandles {