From f0b5cd195dbcee2e212ba2731578aabac1a67973 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 2 Feb 2015 18:37:49 -0800
Subject: [PATCH] Renaming + end of file spaces

---
 libraries/shared/src/SettingHandle.h    | 8 ++++----
 libraries/shared/src/SettingInterface.h | 2 +-
 libraries/shared/src/SettingManager.cpp | 1 -
 libraries/shared/src/SettingManager.h   | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libraries/shared/src/SettingHandle.h b/libraries/shared/src/SettingHandle.h
index 3b01fa3e27..d42fd2b490 100644
--- a/libraries/shared/src/SettingHandle.h
+++ b/libraries/shared/src/SettingHandle.h
@@ -1,5 +1,5 @@
 //
-//  Settings.h
+//  SettingHandle.h
 //
 //
 //  Created by Clement on 1/18/15.
@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_Settings_h
-#define hifi_Settings_h
+#ifndef hifi_SettingHandle_h
+#define hifi_SettingHandle_h
 
 #include <QSettings>
 #include <QString>
@@ -63,4 +63,4 @@ namespace Setting {
     }
 }
 
-#endif // hifi_Settings_h
\ No newline at end of file
+#endif // hifi_SettingHandle_h
\ No newline at end of file
diff --git a/libraries/shared/src/SettingInterface.h b/libraries/shared/src/SettingInterface.h
index 5bb7da4507..43e97d5113 100644
--- a/libraries/shared/src/SettingInterface.h
+++ b/libraries/shared/src/SettingInterface.h
@@ -42,4 +42,4 @@ namespace Setting {
     };
 }
 
-#endif // hifi_SettingInterface_h
\ No newline at end of file
+#endif // hifi_SettingInterface_h
diff --git a/libraries/shared/src/SettingManager.cpp b/libraries/shared/src/SettingManager.cpp
index b9ee39022f..8bb6c89c82 100644
--- a/libraries/shared/src/SettingManager.cpp
+++ b/libraries/shared/src/SettingManager.cpp
@@ -19,7 +19,6 @@ namespace Setting {
         // Cleanup timer
         stopTimer();
         disconnect(_saveTimer, 0, 0, 0);
-        _saveTimer.clear();
         
         // Save all settings before exit
         saveAll();
diff --git a/libraries/shared/src/SettingManager.h b/libraries/shared/src/SettingManager.h
index 8199b29170..f041e39df8 100644
--- a/libraries/shared/src/SettingManager.h
+++ b/libraries/shared/src/SettingManager.h
@@ -45,4 +45,4 @@ namespace Setting {
     };
 }
 
-#endif // hifi_SettingManager_h
\ No newline at end of file
+#endif // hifi_SettingManager_h