diff options
author | Arno <arno@disconnect.de> | 2024-11-09 13:36:49 +0100 |
---|---|---|
committer | Arno <arno@disconnect.de> | 2024-11-09 13:36:49 +0100 |
commit | 550188236d5cc2765b0b84be045a7a4989168437 (patch) | |
tree | bcfa4a018a6c0bd7a83b180e64e9773f1fe37315 | |
parent | 742b5a41d560b2fff8da00a4790670248fc493e6 (diff) | |
download | SheMov-550188236d5cc2765b0b84be045a7a4989168437.tar.gz SheMov-550188236d5cc2765b0b84be045a7a4989168437.tar.bz2 SheMov-550188236d5cc2765b0b84be045a7a4989168437.zip |
Fix constness and a deprecation warning in ArchiveBrowser
-rw-r--r-- | archivebrowser.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/archivebrowser.cpp b/archivebrowser.cpp index 1cae7cf..d3d64a5 100644 --- a/archivebrowser.cpp +++ b/archivebrowser.cpp @@ -58,7 +58,7 @@ ArchiveBrowser::ArchiveBrowser(QWidget *parent) : QWidget(parent), mSelectedSize connect(mQualityFilter, &QComboBox::currentTextChanged, mProxy, &ArchiveBrowserModelProxy::setQualityFilter); toolBar->addSeparator(); mSizeFilter = new QCheckBox(tr("Filter by size")); - connect(mSizeFilter, &QCheckBox::stateChanged, mProxy, &ArchiveBrowserModelProxy::setSizeFilter); + connect(mSizeFilter, &QCheckBox::checkStateChanged, mProxy, &ArchiveBrowserModelProxy::setSizeFilter); toolBar->addWidget(mSizeFilter); toolBar->addSeparator(); QAction *refreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"), this); @@ -98,7 +98,7 @@ ArchiveBrowser::ArchiveBrowser(QWidget *parent) : QWidget(parent), mSelectedSize std::sort(hDataSorted.begin(), hDataSorted.end()); QActionGroup *hDataAG = new QActionGroup(this); hDataAG->setExclusive(false); - for(const QString &h : hDataSorted){ + for(const QString &h : std::as_const(hDataSorted)){ QAction *a = new QAction(h, this); a->setCheckable(true); a->setData(hData.value(h)); @@ -146,12 +146,12 @@ void ArchiveBrowser::browserSelectionChanged(const QItemSelection &selected, con } QModelIndexList selectedIdx = selectedRows(selected); QModelIndexList deselectedIdx = selectedRows(deselected); - for(const QModelIndex &sel : selectedIdx){ + for(const QModelIndex &sel : std::as_const(selectedIdx)){ mSelectedSize += sel.data(ArchiveBrowserModel::TotalSizeRole).toDouble(); ++mSelectedItems; mModel->setData(sel, true, ArchiveBrowserModel::SelectedRole); } - for(const QModelIndex &desel : deselectedIdx){ + for(const QModelIndex &desel : std::as_const(deselectedIdx)){ mSelectedSize -= desel.data(ArchiveBrowserModel::TotalSizeRole).toDouble(); --mSelectedItems; mModel->setData(desel, false, ArchiveBrowserModel::SelectedRole); @@ -191,14 +191,14 @@ void ArchiveBrowser::moveToBurn() { int retval = QMessageBox::question(this, tr("Question"), msg, QMessageBox::Yes | QMessageBox::No); if(retval == QMessageBox::Yes){ QList<int> filesToUpdate; - for(const QModelIndex &idx : sel){ + for(const QModelIndex &idx : std::as_const(sel)){ QString dirName = idx.data(ArchiveBrowserModel::NameRole).toString(); dirName.replace(' ', '.'); burnDir.mkdir(dirName); QString burnDirS = QString("%1/%2").arg(destDirS, dirName); QModelIndex real = mProxy->mapToSource(idx); QModelIndexList children = mModel->children(real); - for(const QModelIndex &child : children){ + for(const QModelIndex &child : std::as_const(children)){ QFileInfo current(child.data(ArchiveBrowserModel::FullPathRole).toString()); int type = child.data(ArchiveBrowserModel::FileTypeRole).toInt(); QString destination = QString("%1/%2").arg(burnDirS, current.fileName()); @@ -251,7 +251,7 @@ void ArchiveBrowser::moveToUSB(){ if(retval == QMessageBox::Yes){ mCopyWorker->clear(); QDir finalD(finalDir); - for(const QModelIndex &idx : sel){ + for(const QModelIndex &idx : std::as_const(sel)){ QString dirName = idx.data(ArchiveBrowserModel::NameRole).toString(); dirName.replace(' ', '.'); // this one .../DVD_123/series_name @@ -259,7 +259,7 @@ void ArchiveBrowser::moveToUSB(){ finalD.mkdir(dirName); QModelIndex real = mProxy->mapToSource(idx); QModelIndexList children = mModel->children(real); - for(const QModelIndex &child : children){ + for(const QModelIndex &child : std::as_const(children)){ QString source = child.data(ArchiveBrowserModel::FullPathRole).toString(); QFileInfo sFi(source); QString destination = QString("%1/%2/%3").arg(finalDir, dirName, sFi.fileName()); @@ -289,10 +289,10 @@ void ArchiveBrowser::playSelected(){ QPair<QString, QStringList> pgdata = Helper::programData("movieviewer"); QModelIndexList sel = mTree->selectionModel()->selectedRows(); QStringList movieFiles; - for(const QModelIndex &idx : sel){ + for(const QModelIndex &idx : std::as_const(sel)){ QModelIndex real = mProxy->mapToSource(idx); QModelIndexList children = mModel->children(real); - for(const QModelIndex &ci : children){ + for(const QModelIndex &ci : std::as_const(children)){ if(ci.data(ArchiveBrowserModel::FileTypeRole).toInt() == 1){ movieFiles << ci.data(ArchiveBrowserModel::FullPathRole).toString(); } @@ -329,7 +329,7 @@ void ArchiveBrowser::setupQualityFilter(){ QList<int> qualities = mModel->availableQualities(); std::sort(qualities.begin(), qualities.end()); QStringList qualityList = QStringList() << tr("(none)"); - for(int q : qualities){ + for(int q : std::as_const(qualities)){ qualityList << QString::number(q); } mQualityFilter->addItems(qualityList); @@ -394,7 +394,7 @@ void ArchiveBrowser::setCopyFile(QString file){ QModelIndexList ArchiveBrowser::selectedRows(const QItemSelection &sel){ QModelIndexList retval; QModelIndexList selIdx = sel.indexes(); - for(const QModelIndex &idx : selIdx){ + for(const QModelIndex &idx : std::as_const(selIdx)){ QModelIndex real = mProxy->mapToSource(idx); if(real.column() == 0){ retval << real; |