Merge pull request #6505 from jonaski/fallthrough
Add fallthrough comment where fallthrough is intended
This commit is contained in:
commit
5123d1dd37
@ -145,20 +145,25 @@ QStandardItem* GlobalSearchModel::BuildContainers(const Song& s,
|
||||
|
||||
case LibraryModel::GroupBy_Composer:
|
||||
display_text = s.composer();
|
||||
// fallthrough
|
||||
case LibraryModel::GroupBy_Performer:
|
||||
display_text = s.performer();
|
||||
// fallthrough
|
||||
case LibraryModel::GroupBy_Disc:
|
||||
display_text = s.disc();
|
||||
// fallthrough
|
||||
case LibraryModel::GroupBy_Grouping:
|
||||
display_text = s.grouping();
|
||||
// fallthrough
|
||||
case LibraryModel::GroupBy_Genre:
|
||||
if (display_text.isNull()) display_text = s.genre();
|
||||
// fallthrough
|
||||
case LibraryModel::GroupBy_Album:
|
||||
unique_tag = s.album_id();
|
||||
if (display_text.isNull()) {
|
||||
display_text = s.album();
|
||||
}
|
||||
// fallthrough
|
||||
// fallthrough
|
||||
case LibraryModel::GroupBy_AlbumArtist:
|
||||
if (display_text.isNull()) display_text = s.effective_albumartist();
|
||||
display_text = LibraryModel::TextOrUnknown(display_text);
|
||||
|
@ -1104,14 +1104,19 @@ LibraryItem* LibraryModel::ItemFromSong(GroupBy type, bool signal,
|
||||
|
||||
case GroupBy_Composer:
|
||||
item->key = s.composer();
|
||||
// fallthrough
|
||||
case GroupBy_Performer:
|
||||
item->key = s.performer();
|
||||
// fallthrough
|
||||
case GroupBy_Grouping:
|
||||
item->key = s.grouping();
|
||||
// fallthrough
|
||||
case GroupBy_Genre:
|
||||
if (item->key.isNull()) item->key = s.genre();
|
||||
// fallthrough
|
||||
case GroupBy_Album:
|
||||
if (item->key.isNull()) item->key = s.album();
|
||||
// fallthrough
|
||||
case GroupBy_AlbumArtist:
|
||||
if (item->key.isNull()) item->key = s.effective_albumartist();
|
||||
item->display_text = TextOrUnknown(item->key);
|
||||
|
Loading…
x
Reference in New Issue
Block a user