diff options
| author | Alexandru Ionut Tripon <alexandru.tripon97@gmail.com> | 2023-08-12 12:42:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-12 12:42:30 +0300 |
| commit | b3b2e9df35222209b4920202d86091eeeb87f03f (patch) | |
| tree | ce44c3877ee36c21279d142b2af1c393e7b87780 /launcher/settings/OverrideSetting.cpp | |
| parent | ca061080c13042642fb3bd49a29a863756f45866 (diff) | |
| parent | 3aba7f8fec45c7c87be486d8f6b5c96f69facf93 (diff) | |
| download | PrismLauncher-b3b2e9df35222209b4920202d86091eeeb87f03f.tar.gz PrismLauncher-b3b2e9df35222209b4920202d86091eeeb87f03f.tar.bz2 PrismLauncher-b3b2e9df35222209b4920202d86091eeeb87f03f.zip | |
Merge branch 'develop' into feat/acknowledge_release_type
Signed-off-by: Alexandru Ionut Tripon <alexandru.tripon97@gmail.com>
Diffstat (limited to 'launcher/settings/OverrideSetting.cpp')
| -rw-r--r-- | launcher/settings/OverrideSetting.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/launcher/settings/OverrideSetting.cpp b/launcher/settings/OverrideSetting.cpp index 4396a381..fee65b8d 100644 --- a/launcher/settings/OverrideSetting.cpp +++ b/launcher/settings/OverrideSetting.cpp @@ -15,8 +15,7 @@ #include "OverrideSetting.h" -OverrideSetting::OverrideSetting(std::shared_ptr<Setting> other, std::shared_ptr<Setting> gate) - : Setting(other->configKeys(), QVariant()) +OverrideSetting::OverrideSetting(std::shared_ptr<Setting> other, std::shared_ptr<Setting> gate) : Setting(other->configKeys(), QVariant()) { Q_ASSERT(other); Q_ASSERT(gate); @@ -36,8 +35,7 @@ QVariant OverrideSetting::defValue() const QVariant OverrideSetting::get() const { - if(isOverriding()) - { + if (isOverriding()) { return Setting::get(); } return m_other->get(); |