Resolve formatting issues.

This commit is contained in:
terrorfisch 2015-10-30 15:13:26 +01:00
parent c75f046c10
commit a51baefde6

View File

@ -842,32 +842,27 @@ void EditTagDialog::FetchTagSongChosen(const Song& original_song,
const QString filename = original_song.url().toLocalFile(); const QString filename = original_song.url().toLocalFile();
// Find the song with this filename // Find the song with this filename
int id; auto data_it =
for (id = 0; id < data_.count(); ++id) std::find_if(data_.begin(), data_.end(), [&filename](const Data& d) {
if (data_[id].original_.url().toLocalFile() == filename) return d.original_.url().toLocalFile() == filename;
break; });
if (data_it == data_.end()) {
if( id == data_.count() ) {
qLog(Warning) << "Could not find song to filename: " << filename; qLog(Warning) << "Could not find song to filename: " << filename;
return; return;
} }
Data& data = data_[id]; data_it->current_.set_title(new_metadata.title());
data.current_.set_title(new_metadata.title()); data_it->current_.set_artist(new_metadata.artist());
data.current_.set_artist(new_metadata.artist()); data_it->current_.set_album(new_metadata.album());
data.current_.set_album(new_metadata.album()); data_it->current_.set_track(new_metadata.track());
data.current_.set_track(new_metadata.track()); data_it->current_.set_year(new_metadata.year());
data.current_.set_year(new_metadata.year());
// Is it currently selected in the UI? // Is it currently selected in the UI?
QModelIndexList selection = int row = data_it - data_.begin();
ui_->song_list->selectionModel()->selectedRows(); if (ui_->song_list->item(row)->isSelected()) {
for( const QModelIndex& i : selection ) {
if ( i.row() == id ) {
// We need to update view // We need to update view
for (const FieldData& field : fields_) for (const FieldData& field : fields_)
InitFieldValue(field, selection); InitFieldValue(field,
break; ui_->song_list->selectionModel()->selectedIndexes());
}
} }
} }