From 27f8f5dcb8c16e4a00770de973597104de62914b Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 10 Jun 2013 14:50:04 -0700 Subject: [PATCH] fix CR feedback --- interface/src/Application.cpp | 11 +++++++---- interface/src/Util.cpp | 9 +-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5aafd9f4a6..01c97766c6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2574,9 +2574,11 @@ void Application::saveAction(QSettings* set, QAction* action) { } void Application::loadSettings(QSettings* settings) { - if (!settings) settings = getSettings(); + if (!settings) { + settings = getSettings(); + } - _headCameraPitchYawScale = settings->value("headCameraPitchYawScale", 0.0f).toFloat(); + _headCameraPitchYawScale = loadSetting(settings, "headCameraPitchYawScale", 0.0f); settings->beginGroup("View Frustum Offset Camera"); // in case settings is corrupt or missing loadSetting() will check for NaN @@ -2593,10 +2595,11 @@ void Application::loadSettings(QSettings* settings) { void Application::saveSettings(QSettings* settings) { - if (!settings) settings = getSettings(); + if (!settings) { + settings = getSettings(); + } settings->setValue("headCameraPitchYawScale", _headCameraPitchYawScale); - settings->beginGroup("View Frustum Offset Camera"); settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffsetYaw); settings->setValue("viewFrustumOffsetPitch", _viewFrustumOffsetPitch); diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp index 5c9d0c8984..74fe5abd1c 100644 --- a/interface/src/Util.cpp +++ b/interface/src/Util.cpp @@ -497,17 +497,10 @@ void runTimingTests() { } - float loadSetting(QSettings* settings, const char* name, float defaultValue) { float value = settings->value(name, 0.0f).toFloat(); if (isnan(value)) { value = defaultValue; } return value; -} - - - - - - +} \ No newline at end of file