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/setting.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/setting.cpp')
| -rw-r--r-- | depends/settings/src/setting.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/depends/settings/src/setting.cpp b/depends/settings/src/setting.cpp index 8e60af06..899463dc 100644 --- a/depends/settings/src/setting.cpp +++ b/depends/settings/src/setting.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,10 +16,9 @@ #include "include/setting.h" #include "include/settingsobject.h" -Setting::Setting(QString id, QVariant defVal, QObject *parent) : - QObject(parent), m_id(id), m_defVal(defVal) +Setting::Setting(QString id, QVariant defVal, QObject *parent) + : QObject(parent), m_id(id), m_defVal(defVal) { - } QVariant Setting::get() const @@ -32,7 +31,7 @@ QVariant Setting::get() const else { QVariant test = sbase->retrieveValue(*this); - if(!test.isValid()) + if (!test.isValid()) return defValue(); return test; } |