diff --git a/cockatrice/src/dialogs/dlg_settings.cpp b/cockatrice/src/dialogs/dlg_settings.cpp index ccc29a4cd..d72ba992e 100644 --- a/cockatrice/src/dialogs/dlg_settings.cpp +++ b/cockatrice/src/dialogs/dlg_settings.cpp @@ -174,7 +174,8 @@ GeneralSettingsPage::GeneralSettingsPage() GeneralSettingsPage::retranslateUi(); // connect the ReleaseChannel combo box only after the entries are inserted in retranslateUi - connect(&updateReleaseChannelBox, SIGNAL(currentIndexChanged(int)), &settings, SLOT(setUpdateReleaseChannel(int))); + connect(&updateReleaseChannelBox, SIGNAL(currentIndexChanged(int)), &settings, + SLOT(setUpdateReleaseChannelIndex(int))); updateReleaseChannelBox.setCurrentIndex(settings.getUpdateReleaseChannelIndex()); setLayout(mainLayout); diff --git a/cockatrice/src/settings/cache_settings.cpp b/cockatrice/src/settings/cache_settings.cpp index 618892044..29fec11ac 100644 --- a/cockatrice/src/settings/cache_settings.cpp +++ b/cockatrice/src/settings/cache_settings.cpp @@ -1139,9 +1139,9 @@ void SettingsCache::setDownloadSpoilerStatus(bool _spoilerStatus) emit downloadSpoilerStatusChanged(); } -void SettingsCache::setUpdateReleaseChannel(int _updateReleaseChannel) +void SettingsCache::setUpdateReleaseChannelIndex(int value) { - updateReleaseChannel = _updateReleaseChannel; + updateReleaseChannel = value; settings->setValue("personal/updatereleasechannel", updateReleaseChannel); } diff --git a/cockatrice/src/settings/cache_settings.h b/cockatrice/src/settings/cache_settings.h index e3a7904c9..b62addd1e 100644 --- a/cockatrice/src/settings/cache_settings.h +++ b/cockatrice/src/settings/cache_settings.h @@ -716,7 +716,7 @@ public slots: void setCheckUpdatesOnStartup(QT_STATE_CHANGED_T value); void setNotifyAboutUpdate(QT_STATE_CHANGED_T _notifyaboutupdate); void setNotifyAboutNewVersion(QT_STATE_CHANGED_T _notifyaboutnewversion); - void setUpdateReleaseChannel(int _updateReleaseChannel); + void setUpdateReleaseChannelIndex(int value); void setMaxFontSize(int _max); }; diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp index 58ed79bf5..016f5073f 100644 --- a/dbconverter/src/mocks.cpp +++ b/dbconverter/src/mocks.cpp @@ -321,7 +321,7 @@ void SettingsCache::setNotifyAboutNewVersion(QT_STATE_CHANGED_T /* _notifyaboutn void SettingsCache::setDownloadSpoilerStatus(bool /* _spoilerStatus */) { } -void SettingsCache::setUpdateReleaseChannel(int /* _updateReleaseChannel */) +void SettingsCache::setUpdateReleaseChannelIndex(int /* value */) { } void SettingsCache::setMaxFontSize(int /* _max */) diff --git a/tests/carddatabase/mocks.cpp b/tests/carddatabase/mocks.cpp index cfa2e947d..6dbe05304 100644 --- a/tests/carddatabase/mocks.cpp +++ b/tests/carddatabase/mocks.cpp @@ -325,7 +325,7 @@ void SettingsCache::setNotifyAboutNewVersion(QT_STATE_CHANGED_T /* _notifyaboutn void SettingsCache::setDownloadSpoilerStatus(bool /* _spoilerStatus */) { } -void SettingsCache::setUpdateReleaseChannel(int /* _updateReleaseChannel */) +void SettingsCache::setUpdateReleaseChannelIndex(int /* value */) { } void SettingsCache::setMaxFontSize(int /* _max */)