aboutsummaryrefslogtreecommitdiff
path: root/launcher/settings/Setting.cpp
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-05 18:21:09 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-05 18:21:09 +0300
commit939a2d67ed75be714e9f3b1b918250d006b3860a (patch)
treec5700ba93652e26fc1f86235b1a278d90fd0ce91 /launcher/settings/Setting.cpp
parent6f7d901a1f5c02e0629e4bae9172c04bb81ce0d9 (diff)
parentae793f6cf11658c9abc5111e82d5ba7b3e6af127 (diff)
downloadPrismLauncher-939a2d67ed75be714e9f3b1b918250d006b3860a.tar.gz
PrismLauncher-939a2d67ed75be714e9f3b1b918250d006b3860a.tar.bz2
PrismLauncher-939a2d67ed75be714e9f3b1b918250d006b3860a.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/settings/Setting.cpp')
-rw-r--r--launcher/settings/Setting.cpp14
1 files changed, 4 insertions, 10 deletions
diff --git a/launcher/settings/Setting.cpp b/launcher/settings/Setting.cpp
index cfe5a7f9..1e861e36 100644
--- a/launcher/settings/Setting.cpp
+++ b/launcher/settings/Setting.cpp
@@ -16,20 +16,14 @@
#include "Setting.h"
#include "settings/SettingsObject.h"
-Setting::Setting(QStringList synonyms, QVariant defVal)
- : QObject(), m_synonyms(synonyms), m_defVal(defVal)
-{
-}
+Setting::Setting(QStringList synonyms, QVariant defVal) : QObject(), m_synonyms(synonyms), m_defVal(defVal) {}
QVariant Setting::get() const
{
- SettingsObject *sbase = m_storage;
- if (!sbase)
- {
+ SettingsObject* sbase = m_storage;
+ if (!sbase) {
return defValue();
- }
- else
- {
+ } else {
QVariant test = sbase->retrieveValue(*this);
if (!test.isValid())
return defValue();