aboutsummaryrefslogtreecommitdiff
path: root/launcher/settings
diff options
context:
space:
mode:
authorTrial97 <alexandru.tripon97@gmail.com>2023-05-14 14:20:04 +0300
committerTrial97 <alexandru.tripon97@gmail.com>2023-05-14 14:20:04 +0300
commit8c7fd3327ecfb31fde4ae843a5d66e0ef29026ff (patch)
treeb48975200ce3eee6c5dbf1070c71b8d71ece1ffb /launcher/settings
parente4449a0ba32593b4fd76e3f2ced176e5b3bbd952 (diff)
parentd5c6a1b4d1e6d052e42366d19ffa0047168e030d (diff)
downloadPrismLauncher-8c7fd3327ecfb31fde4ae843a5d66e0ef29026ff.tar.gz
PrismLauncher-8c7fd3327ecfb31fde4ae843a5d66e0ef29026ff.tar.bz2
PrismLauncher-8c7fd3327ecfb31fde4ae843a5d66e0ef29026ff.zip
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into Fix_Assert
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 &)));
}