Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:00:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

back out some uneeded chagnes

Browse source
This commit is contained in:
Seth Alves 2016-08-04 14:09:12 -07:00
parent 981a8d76fa
commit a2441ca84c
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/shared/src/SettingHandle.cpp
View file

@ -89,11 +89,7 @@ void Settings::setValue(const QString& name, const QVariant& value) {
} }
QVariant Settings::value(const QString& name, const QVariant& defaultValue) const { QVariant Settings::value(const QString& name, const QVariant& defaultValue) const {
QVariant result = _manager->value(name, defaultValue); return _manager->value(name, defaultValue);
if (result == _manager->unsetValue()) {
return defaultValue;
}
return result;
} }

1
libraries/shared/src/SettingManager.h
View file

@ -28,7 +28,6 @@ namespace Setting {
public: public:
void customDeleter() override; void customDeleter() override;
const QVariant& unsetValue() { return UNSET_VALUE; }
protected: protected:
~Manager(); ~Manager();