diff options
Diffstat (limited to 'playerwidget.cpp')
| -rw-r--r-- | playerwidget.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/playerwidget.cpp b/playerwidget.cpp index 6da2401..61804fa 100644 --- a/playerwidget.cpp +++ b/playerwidget.cpp @@ -760,7 +760,7 @@ void PlayerWidget::doPopulateByFolder(){ QIcon otherIcon(":/belly_right_and_clear.png"); QIcon dirIcon(":/folder.png"); QFileInfoList fl = d.entryInfoList(QStringList() << "*", QDir::Files | QDir::Dirs | QDir::NoDot, QDir::Name | QDir::DirsFirst); - foreach(QFileInfo fi, fl){ + for(const QFileInfo &fi : fl){ QStandardItem *cur = new QStandardItem; cur->setEditable(false); cur->setText(fi.fileName()); @@ -975,7 +975,7 @@ void PlayerWidget::doSelectFiles(){ if(ok && !pattern.isEmpty()){ QList<QStandardItem*> items = mFolderModel->findItems(pattern, Qt::MatchWildcard); mView->selectionModel()->clear(); - foreach(QStandardItem *i, items){ + for(QStandardItem *i : items){ QModelIndex idx = mFolderModel->indexFromItem(i); mView->selectionModel()->select(idx, QItemSelectionModel::Rows | QItemSelectionModel::Toggle); } @@ -992,7 +992,7 @@ void PlayerWidget::doDeleteFiles(){ QString msg = QString(tr("Really delete %1 file(s)?")).arg(QString::number(sel.count())); int r = QMessageBox::question(this, tr("Delete files..."), msg); if(r == QMessageBox::Yes){ - foreach(QModelIndex i, sel){ + for(const QModelIndex &i : sel){ QString cur = i.data(FullPathRole).toString(); QFileInfo file(cur); if(file.isFile()){ @@ -1096,7 +1096,7 @@ void PlayerWidget::addSong(const QModelIndex &idx){ QString artist = idx.data(ArtistRole).toString(); QString album = idx.data(AlbumRole).toString(); QStringList args = QStringList() << title << artist << album; - foreach(QString s, args){ + for(QString &s : args){ if(s.isEmpty()){ s = QString(tr("n/a")); } @@ -1270,7 +1270,7 @@ void PlayerWidget::addToPlayList(){ if(sel.isEmpty()){ return; } - foreach(QModelIndex i, sel){ + for(const QModelIndex &i : sel){ int type = i.data(TypeRole).toInt(); if(type == Song){ addSong(i); @@ -1292,11 +1292,11 @@ void PlayerWidget::removeFromPlayList(){ QModelIndexList sel = mPlayListView->selectionModel()->selectedRows(); QList<QPersistentModelIndex> persistent; int subSecs = 0; - foreach(QModelIndex i, sel){ + for(const QModelIndex &i : sel){ subSecs = i.data(LengthRole).toInt(); persistent << QPersistentModelIndex(i); } - foreach(QPersistentModelIndex i, persistent){ + for(const QPersistentModelIndex &i : persistent){ mPlayListModel->removeRow(i.row()); } QStandardItem *root = mPlayListModel->invisibleRootItem(); @@ -1311,7 +1311,7 @@ void PlayerWidget::removeFromFavorites(){ QSqlQuery favRemoveQ(db); favRemoveQ.prepare("DELETE FROM persistent_favorites WHERE tartist_name = :artist AND talbum_name = :album AND ttitle = :title"); QVector<QStringList> toRemove; - foreach(QModelIndex i, sel){ + for(const QModelIndex &i : sel){ QStringList cur; cur << i.data(ArtistRole).toString(); cur << i.data(AlbumRole).toString(); @@ -1319,7 +1319,7 @@ void PlayerWidget::removeFromFavorites(){ toRemove << cur; } int cnt = 0; - foreach(QStringList sl, toRemove){ + for(const QStringList &sl : toRemove){ favRemoveQ.bindValue(":artist", sl.at(0)); favRemoveQ.bindValue(":album", sl.at(1)); favRemoveQ.bindValue(":title", sl.at(2)); @@ -1342,7 +1342,7 @@ void PlayerWidget::addToFavorites(){ QSqlDatabase db = QSqlDatabase::database("beetplayerdb"); QSqlQuery favInsertQ(db); favInsertQ.prepare("INSERT INTO persistent_favorites (tartist_name, talbum_name, ttitle) VALUES(:artist, :album, :title)"); - foreach(QModelIndex i, sel){ + for(const QModelIndex &i : sel){ QString artist = i.data(ArtistRole).toString(); QString album = i.data(AlbumRole).toString(); QString title = i.data(TitleRole).toString(); @@ -1378,7 +1378,7 @@ void PlayerWidget::shufflePlayList(){ mPlayListModel->clear(); mPlayListModel->setHorizontalHeaderLabels(QStringList() << "Title"); QStandardItem *root = mPlayListModel->invisibleRootItem(); - foreach(QStandardItem *i, items){ + for(QStandardItem *i : items){ root->appendRow(i); } } @@ -1428,7 +1428,7 @@ void PlayerWidget::printList(){ return; } QString output; - foreach(QModelIndex i, sel){ + for(const QModelIndex &i : sel){ QString fp = i.data(FullPathRole).toString(); TagLib::FileRef fr(fp.toUtf8()); if(!fr.isNull()){ @@ -1481,7 +1481,7 @@ void PlayerWidget::webDlDone(){ if(!aId.isEmpty()){ text.append(QString(tr("<b>Musicbrainz:</b><table style=\"margin-bottom: 20px\">"))); text.append(QString(tr("<tr><td style=\"padding-left: 30px\">Artist</td><td style=\"padding-left: 30px\"><a href=\"https://musicbrainz.org/artist/%1\">%2</a></td></tr>")).arg(aId).arg(mWebDownloader->artist())); - foreach(QString alId, mWebDownloader->data()){ + for(const QString &alId : mWebDownloader->data()){ text.append(QString("<tr><td style=\"padding-left: 30px\">Album</td><td style=\"padding-left: 30px\"><a href=\"https://musicbrainz.org/release-group/%1\">%2</a></td></tr>").arg(alId).arg(mWebDownloader->album())); } text.append("</table>"); @@ -1490,7 +1490,7 @@ void PlayerWidget::webDlDone(){ return a.at(2).toInt() < b.at(2).toInt(); }); text.append(QString(tr("<b>All Albums (%1):</b><dl>")).arg(QString::number(other.count()))); - foreach(const QVariant vl, other){ + for(const QVariant &vl : other){ QVariantList cur = vl.toList(); QString id = cur.at(0).toString(); QString album = cur.at(1).toString(); @@ -1708,7 +1708,7 @@ void PlayerWidget::continuePlaying(QMediaPlayer::MediaStatus state){ void PlayerWidget::expand(){ QModelIndexList sel = mView->selectionModel()->selectedRows(); - foreach(QModelIndex i, sel){ + for(const QModelIndex &i : sel){ mView->expand(i); expandRecursive(i); } |