Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 04:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Moved loadSetting to MyAvatar

Browse source
This commit is contained in:
Atlante45 2015-01-20 00:56:25 -08:00
parent 75ce99cd62
commit e4fa9e508e
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/avatar/MyAvatar.cpp
View file

@ -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");

2
libraries/shared/src/Settings.cpp
View file

@ -27,4 +27,4 @@ void SettingsBridge::removeFromSettings(const QString& key) {
QSettings().remove(key);
}
}
}

9
libraries/shared/src/Settings.h
View file

@ -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 {