aboutsummaryrefslogtreecommitdiff
path: root/launcher/settings/Setting.cpp
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:09:10 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-08-05 19:09:10 +0300
commitb2fdd8359405c93d0d93aa8c68971c986a1f68cb (patch)
tree59859119373213ce04b2f5e2d7a95227b57be609 /launcher/settings/Setting.cpp
parent149b6d59cf848a3b3cd50b3aee1c112e9c47e633 (diff)
parentae793f6cf11658c9abc5111e82d5ba7b3e6af127 (diff)
downloadPrismLauncher-b2fdd8359405c93d0d93aa8c68971c986a1f68cb.tar.gz
PrismLauncher-b2fdd8359405c93d0d93aa8c68971c986a1f68cb.tar.bz2
PrismLauncher-b2fdd8359405c93d0d93aa8c68971c986a1f68cb.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads
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();