aboutsummaryrefslogtreecommitdiff
path: root/launcher/settings
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-05-14 14:20:24 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-05-14 14:20:24 +0300
commitffcc58cb3e89c502cfc12183d091dd9719ab436c (patch)
treef247a5b6d21cf71ea46782286fadde926db61d84 /launcher/settings
parentef6cbdfa2ade6a5f1ccb7253c1647ce1e9d5442d (diff)
parentd5c6a1b4d1e6d052e42366d19ffa0047168e030d (diff)
downloadPrismLauncher-ffcc58cb3e89c502cfc12183d091dd9719ab436c.tar.gz
PrismLauncher-ffcc58cb3e89c502cfc12183d091dd9719ab436c.tar.bz2
PrismLauncher-ffcc58cb3e89c502cfc12183d091dd9719ab436c.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Diffstat (limited to 'launcher/settings')
-rw-r--r--launcher/settings/SettingsObject.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/launcher/settings/SettingsObject.cpp b/launcher/settings/SettingsObject.cpp
index 8a0bc045..634acd34 100644
--- a/launcher/settings/SettingsObject.cpp
+++ b/launcher/settings/SettingsObject.cpp
@@ -132,11 +132,10 @@ bool SettingsObject::reload()
void SettingsObject::connectSignals(const Setting &setting)
{
- connect(&setting, SIGNAL(SettingChanged(const Setting &, QVariant)),
- SLOT(changeSetting(const Setting &, QVariant)));
- connect(&setting, SIGNAL(SettingChanged(const Setting &, QVariant)),
+ connect(&setting, &Setting::SettingChanged, this, &SettingsObject::changeSetting);
+ connect(&setting, SIGNAL(SettingChanged(const Setting &, QVariant)), this,
SIGNAL(SettingChanged(const Setting &, QVariant)));
- connect(&setting, SIGNAL(settingReset(Setting)), SLOT(resetSetting(const Setting &)));
- connect(&setting, SIGNAL(settingReset(Setting)), SIGNAL(settingReset(const Setting &)));
+ connect(&setting, &Setting::settingReset, this, &SettingsObject::resetSetting);
+ connect(&setting, SIGNAL(settingReset(Setting)), this, SIGNAL(settingReset(const Setting &)));
}