Use C++11 enum class
This commit is contained in:
@@ -99,17 +99,17 @@ void ScrobblerSettingsPage::Load() {
|
||||
ui_->checkbox_albumartist->setChecked(scrobbler_->PreferAlbumArtist());
|
||||
ui_->checkbox_show_error_dialog->setChecked(scrobbler_->ShowErrorDialog());
|
||||
|
||||
ui_->checkbox_source_collection->setChecked(scrobbler_->sources().contains(Song::Source_Collection));
|
||||
ui_->checkbox_source_local->setChecked(scrobbler_->sources().contains(Song::Source_LocalFile));
|
||||
ui_->checkbox_source_cdda->setChecked(scrobbler_->sources().contains(Song::Source_CDDA));
|
||||
ui_->checkbox_source_device->setChecked(scrobbler_->sources().contains(Song::Source_Device));
|
||||
ui_->checkbox_source_subsonic->setChecked(scrobbler_->sources().contains(Song::Source_Subsonic));
|
||||
ui_->checkbox_source_tidal->setChecked(scrobbler_->sources().contains(Song::Source_Tidal));
|
||||
ui_->checkbox_source_qobuz->setChecked(scrobbler_->sources().contains(Song::Source_Qobuz));
|
||||
ui_->checkbox_source_stream->setChecked(scrobbler_->sources().contains(Song::Source_Stream));
|
||||
ui_->checkbox_source_somafm->setChecked(scrobbler_->sources().contains(Song::Source_SomaFM));
|
||||
ui_->checkbox_source_radioparadise->setChecked(scrobbler_->sources().contains(Song::Source_RadioParadise));
|
||||
ui_->checkbox_source_unknown->setChecked(scrobbler_->sources().contains(Song::Source_Unknown));
|
||||
ui_->checkbox_source_collection->setChecked(scrobbler_->sources().contains(Song::Source::Collection));
|
||||
ui_->checkbox_source_local->setChecked(scrobbler_->sources().contains(Song::Source::LocalFile));
|
||||
ui_->checkbox_source_cdda->setChecked(scrobbler_->sources().contains(Song::Source::CDDA));
|
||||
ui_->checkbox_source_device->setChecked(scrobbler_->sources().contains(Song::Source::Device));
|
||||
ui_->checkbox_source_subsonic->setChecked(scrobbler_->sources().contains(Song::Source::Subsonic));
|
||||
ui_->checkbox_source_tidal->setChecked(scrobbler_->sources().contains(Song::Source::Tidal));
|
||||
ui_->checkbox_source_qobuz->setChecked(scrobbler_->sources().contains(Song::Source::Qobuz));
|
||||
ui_->checkbox_source_stream->setChecked(scrobbler_->sources().contains(Song::Source::Stream));
|
||||
ui_->checkbox_source_somafm->setChecked(scrobbler_->sources().contains(Song::Source::SomaFM));
|
||||
ui_->checkbox_source_radioparadise->setChecked(scrobbler_->sources().contains(Song::Source::RadioParadise));
|
||||
ui_->checkbox_source_unknown->setChecked(scrobbler_->sources().contains(Song::Source::Unknown));
|
||||
|
||||
ui_->checkbox_lastfm_enable->setChecked(lastfmscrobbler_->IsEnabled());
|
||||
ui_->checkbox_lastfm_https->setChecked(lastfmscrobbler_->IsUseHTTPS());
|
||||
@@ -142,17 +142,17 @@ void ScrobblerSettingsPage::Save() {
|
||||
s.setValue("show_error_dialog", ui_->checkbox_show_error_dialog->isChecked());
|
||||
|
||||
QStringList sources;
|
||||
if (ui_->checkbox_source_collection->isChecked()) sources << Song::TextForSource(Song::Source_Collection);
|
||||
if (ui_->checkbox_source_local->isChecked()) sources << Song::TextForSource(Song::Source_LocalFile);
|
||||
if (ui_->checkbox_source_cdda->isChecked()) sources << Song::TextForSource(Song::Source_CDDA);
|
||||
if (ui_->checkbox_source_device->isChecked()) sources << Song::TextForSource(Song::Source_Device);
|
||||
if (ui_->checkbox_source_subsonic->isChecked()) sources << Song::TextForSource(Song::Source_Subsonic);
|
||||
if (ui_->checkbox_source_tidal->isChecked()) sources << Song::TextForSource(Song::Source_Tidal);
|
||||
if (ui_->checkbox_source_qobuz->isChecked()) sources << Song::TextForSource(Song::Source_Qobuz);
|
||||
if (ui_->checkbox_source_stream->isChecked()) sources << Song::TextForSource(Song::Source_Stream);
|
||||
if (ui_->checkbox_source_somafm->isChecked()) sources << Song::TextForSource(Song::Source_SomaFM);
|
||||
if (ui_->checkbox_source_radioparadise->isChecked()) sources << Song::TextForSource(Song::Source_RadioParadise);
|
||||
if (ui_->checkbox_source_unknown->isChecked()) sources << Song::TextForSource(Song::Source_Unknown);
|
||||
if (ui_->checkbox_source_collection->isChecked()) sources << Song::TextForSource(Song::Source::Collection);
|
||||
if (ui_->checkbox_source_local->isChecked()) sources << Song::TextForSource(Song::Source::LocalFile);
|
||||
if (ui_->checkbox_source_cdda->isChecked()) sources << Song::TextForSource(Song::Source::CDDA);
|
||||
if (ui_->checkbox_source_device->isChecked()) sources << Song::TextForSource(Song::Source::Device);
|
||||
if (ui_->checkbox_source_subsonic->isChecked()) sources << Song::TextForSource(Song::Source::Subsonic);
|
||||
if (ui_->checkbox_source_tidal->isChecked()) sources << Song::TextForSource(Song::Source::Tidal);
|
||||
if (ui_->checkbox_source_qobuz->isChecked()) sources << Song::TextForSource(Song::Source::Qobuz);
|
||||
if (ui_->checkbox_source_stream->isChecked()) sources << Song::TextForSource(Song::Source::Stream);
|
||||
if (ui_->checkbox_source_somafm->isChecked()) sources << Song::TextForSource(Song::Source::SomaFM);
|
||||
if (ui_->checkbox_source_radioparadise->isChecked()) sources << Song::TextForSource(Song::Source::RadioParadise);
|
||||
if (ui_->checkbox_source_unknown->isChecked()) sources << Song::TextForSource(Song::Source::Unknown);
|
||||
|
||||
s.setValue("sources", sources);
|
||||
|
||||
@@ -179,7 +179,7 @@ void ScrobblerSettingsPage::Save() {
|
||||
void ScrobblerSettingsPage::LastFM_Login() {
|
||||
|
||||
lastfm_waiting_for_auth_ = true;
|
||||
ui_->widget_lastfm_login_state->SetLoggedIn(LoginStateWidget::LoginInProgress);
|
||||
ui_->widget_lastfm_login_state->SetLoggedIn(LoginStateWidget::State::LoginInProgress);
|
||||
lastfmscrobbler_->Authenticate(ui_->checkbox_lastfm_https->isChecked());
|
||||
|
||||
}
|
||||
@@ -208,13 +208,13 @@ void ScrobblerSettingsPage::LastFM_AuthenticationComplete(const bool success, co
|
||||
}
|
||||
|
||||
void ScrobblerSettingsPage::LastFM_RefreshControls(const bool authenticated) {
|
||||
ui_->widget_lastfm_login_state->SetLoggedIn(authenticated ? LoginStateWidget::LoggedIn : LoginStateWidget::LoggedOut, lastfmscrobbler_->username());
|
||||
ui_->widget_lastfm_login_state->SetLoggedIn(authenticated ? LoginStateWidget::State::LoggedIn : LoginStateWidget::State::LoggedOut, lastfmscrobbler_->username());
|
||||
}
|
||||
|
||||
void ScrobblerSettingsPage::LibreFM_Login() {
|
||||
|
||||
librefm_waiting_for_auth_ = true;
|
||||
ui_->widget_librefm_login_state->SetLoggedIn(LoginStateWidget::LoginInProgress);
|
||||
ui_->widget_librefm_login_state->SetLoggedIn(LoginStateWidget::State::LoginInProgress);
|
||||
librefmscrobbler_->Authenticate();
|
||||
|
||||
}
|
||||
@@ -243,13 +243,13 @@ void ScrobblerSettingsPage::LibreFM_AuthenticationComplete(const bool success, c
|
||||
}
|
||||
|
||||
void ScrobblerSettingsPage::LibreFM_RefreshControls(const bool authenticated) {
|
||||
ui_->widget_librefm_login_state->SetLoggedIn(authenticated ? LoginStateWidget::LoggedIn : LoginStateWidget::LoggedOut, librefmscrobbler_->username());
|
||||
ui_->widget_librefm_login_state->SetLoggedIn(authenticated ? LoginStateWidget::State::LoggedIn : LoginStateWidget::State::LoggedOut, librefmscrobbler_->username());
|
||||
}
|
||||
|
||||
void ScrobblerSettingsPage::ListenBrainz_Login() {
|
||||
|
||||
listenbrainz_waiting_for_auth_ = true;
|
||||
ui_->widget_listenbrainz_login_state->SetLoggedIn(LoginStateWidget::LoginInProgress);
|
||||
ui_->widget_listenbrainz_login_state->SetLoggedIn(LoginStateWidget::State::LoginInProgress);
|
||||
listenbrainzscrobbler_->Authenticate();
|
||||
|
||||
}
|
||||
@@ -278,5 +278,5 @@ void ScrobblerSettingsPage::ListenBrainz_AuthenticationComplete(const bool succe
|
||||
}
|
||||
|
||||
void ScrobblerSettingsPage::ListenBrainz_RefreshControls(const bool authenticated) {
|
||||
ui_->widget_listenbrainz_login_state->SetLoggedIn(authenticated ? LoginStateWidget::LoggedIn : LoginStateWidget::LoggedOut);
|
||||
ui_->widget_listenbrainz_login_state->SetLoggedIn(authenticated ? LoginStateWidget::State::LoggedIn : LoginStateWidget::State::LoggedOut);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user