diff options
author | Sky <git@bunnies.cc> | 2013-11-06 17:02:23 +0000 |
---|---|---|
committer | Sky <git@bunnies.cc> | 2013-11-06 17:02:23 +0000 |
commit | 7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a (patch) | |
tree | 2753d1ee11dad2cf1c4ce1e8a28ead92214f2f1c /depends/settings/src/basicsettingsobject.cpp | |
parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
parent | bba4ed5ab2c98c3d60a141d6a089a49716753615 (diff) | |
download | MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.gz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.lz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.xz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.zip |
Merge branch 'develop'
Diffstat (limited to 'depends/settings/src/basicsettingsobject.cpp')
-rw-r--r-- | depends/settings/src/basicsettingsobject.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/depends/settings/src/basicsettingsobject.cpp b/depends/settings/src/basicsettingsobject.cpp index 484928c8..96b38851 100644 --- a/depends/settings/src/basicsettingsobject.cpp +++ b/depends/settings/src/basicsettingsobject.cpp @@ -3,7 +3,7 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software @@ -16,17 +16,15 @@ #include "include/basicsettingsobject.h" #include "include/setting.h" -BasicSettingsObject::BasicSettingsObject(QObject *parent) : - SettingsObject(parent) +BasicSettingsObject::BasicSettingsObject(QObject *parent) : SettingsObject(parent) { - } void BasicSettingsObject::changeSetting(const Setting &setting, QVariant value) { if (contains(setting.id())) { - if(value.isValid()) + if (value.isValid()) config.setValue(setting.configKey(), value); else config.remove(setting.configKey()); |