Totally removed Application's setting memember

Atlante45 committed 11 years ago

Commit c2b7ff11 parent 92e9df011 files · +94 −142Browse files

Showing the changes to interface/src/Menu.cpp (1 of 11 files). Show all

Unified · Split

 #include <DependencyManager.h>
 #include <GlowEffect.h>
 #include <PathUtils.h>
+#include <Settings.h>
 #include <UserActivityLogger.h>
 #include <XmppClient.h>
 }
 void Menu::loadSettings(QSettings* settings) {
-    bool lockedSettings = false;
+    Settings defaultSettings;
     if (!settings) {
-        settings = qApp->lockSettings();
+        settings = &defaultSettings;
-        lockedSettings = true;
     }
     auto audio = DependencyManager::get<Audio>();
     myAvatar->updateCollisionGroups();
     myAvatar->onToggleRagdoll();
     myAvatar->updateMotionBehavior();
-    if (lockedSettings) {
-        qApp->unlockSettings();
-    }
 }
 void Menu::saveSettings(QSettings* settings) {
-    bool lockedSettings = false;
+    Settings defaultSettings;
     if (!settings) {
-        settings = qApp->lockSettings();
+        settings = &defaultSettings;
-        lockedSettings = true;
     }
     auto audio = DependencyManager::get<Audio>();
     qApp->getAvatar()->saveData(settings);
     DependencyManager::get<AddressManager>()->storeCurrentAddress();
-    if (lockedSettings) {
-        qApp->unlockSettings();
-    }
 }
 void Menu::importSettings() {