Fix compile warnings

This commit is contained in:
Jonas Kvinge
2020-04-23 21:08:28 +02:00
parent a303850341
commit 8da4c88fd3
54 changed files with 509 additions and 461 deletions

View File

@@ -799,19 +799,19 @@ SongMimeData *AlbumCoverManager::GetMimeDataForAlbums(const QModelIndexList &ind
SongList songs = GetSongsInAlbums(indexes);
if (songs.isEmpty()) return nullptr;
SongMimeData *data = new SongMimeData;
data->backend = collection_backend_;
data->songs = songs;
return data;
SongMimeData *mimedata = new SongMimeData;
mimedata->backend = collection_backend_;
mimedata->songs = songs;
return mimedata;
}
void AlbumCoverManager::AlbumDoubleClicked(const QModelIndex &index) {
SongMimeData *data = GetMimeDataForAlbums(QModelIndexList() << index);
if (data) {
data->from_doubleclick_ = true;
emit AddToPlaylist(data);
SongMimeData *mimedata = GetMimeDataForAlbums(QModelIndexList() << index);
if (mimedata) {
mimedata->from_doubleclick_ = true;
emit AddToPlaylist(mimedata);
}
}
@@ -822,10 +822,10 @@ void AlbumCoverManager::AddSelectedToPlaylist() {
void AlbumCoverManager::LoadSelectedToPlaylist() {
SongMimeData *data = GetMimeDataForAlbums(ui_->albums->selectionModel()->selectedIndexes());
if (data) {
data->clear_first_ = true;
emit AddToPlaylist(data);
SongMimeData *mimedata = GetMimeDataForAlbums(ui_->albums->selectionModel()->selectedIndexes());
if (mimedata) {
mimedata->clear_first_ = true;
emit AddToPlaylist(mimedata);
}
}

View File

@@ -220,20 +220,20 @@ void AlbumCoverSearcher::SearchFinished(const quint64 id, const CoverSearchResul
for (const CoverSearchResult &result : results) {
if (result.image_url.isEmpty()) continue;
quint64 id = app_->album_cover_loader()->LoadImageAsync(options_, result.image_url, QUrl());
quint64 new_id = app_->album_cover_loader()->LoadImageAsync(options_, result.image_url, QUrl());
QStandardItem *item = new QStandardItem;
item->setIcon(no_cover_icon_);
item->setText(result.artist + " - " + result.album);
item->setData(result.image_url, Role_ImageURL);
item->setData(id, Role_ImageRequestId);
item->setData(new_id, Role_ImageRequestId);
item->setData(false, Role_ImageFetchFinished);
item->setData(QVariant(Qt::AlignTop | Qt::AlignHCenter), Qt::TextAlignmentRole);
item->setData(result.provider, GroupedIconView::Role_Group);
model_->appendRow(item);
cover_loading_tasks_[id] = item;
cover_loading_tasks_[new_id] = item;
}
if (cover_loading_tasks_.isEmpty()) ui_->busy->hide();