diff options
| -rw-r--r-- | archivebrowser.cpp | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/archivebrowser.cpp b/archivebrowser.cpp index 1b1107d..1fbbeab 100644 --- a/archivebrowser.cpp +++ b/archivebrowser.cpp @@ -54,10 +54,10 @@ ArchiveBrowser::ArchiveBrowser(QWidget *parent) : QWidget(parent), mSelectedSize filterLayout->addWidget(filterL); filterLayout->addWidget(qualityL); setupQualityFilter(); - connect(mQualityFilter, SIGNAL(currentIndexChanged(QString)), mProxy, SLOT(setQualityFilter(QString))); + connect(mQualityFilter, QOverload<const QString &>::of(&QComboBox::currentIndexChanged), mProxy, &ArchiveBrowserModelProxy::setQualityFilter); filterLayout->addWidget(mQualityFilter); mSizeFilter = new QCheckBox(tr("Size Filter")); - connect(mSizeFilter, SIGNAL(stateChanged(int)), mProxy, SLOT(setSizeFilter(int))); + connect(mSizeFilter, &QCheckBox::stateChanged, mProxy, &ArchiveBrowserModelProxy::setSizeFilter); filterLayout->addWidget(mSizeFilter); QWidget *filterWidget = new QWidget; filterWidget->setLayout(filterLayout); @@ -66,9 +66,9 @@ ArchiveBrowser::ArchiveBrowser(QWidget *parent) : QWidget(parent), mSelectedSize mTbSplitter->addWidget(mToolBar); //connect - connect(mTree->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(browserSelectionChanged(QItemSelection,QItemSelection))); - connect(mTree, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(itemDoubleClicked(QModelIndex))); - connect(mModel, SIGNAL(populated()), this, SLOT(resetAll())); + connect(mTree->selectionModel(), &QItemSelectionModel::selectionChanged, this, &ArchiveBrowser::browserSelectionChanged); + connect(mTree, &SmTreeView::doubleClicked, this, &ArchiveBrowser::itemDoubleClicked); + connect(mModel, &ArchiveBrowserModel::populated, this, &ArchiveBrowser::resetAll); //make widget QVBoxLayout *mainLayout = new QVBoxLayout; @@ -80,20 +80,20 @@ ArchiveBrowser::ArchiveBrowser(QWidget *parent) : QWidget(parent), mSelectedSize //copyworker mUSBProgress = 0; mCopyWorker = new CopyWorker(this); - connect(mCopyWorker, SIGNAL(error(QString)), this, SLOT(copyError(QString))); - connect(mCopyWorker, SIGNAL(success(QString)), this, SLOT(copySuccess(QString))); - connect(mCopyWorker, SIGNAL(file(QString)), this, SLOT(setCopyFile(QString))); + connect(mCopyWorker, &CopyWorker::error, this, &ArchiveBrowser::copyError); + connect(mCopyWorker, &CopyWorker::success, this, &ArchiveBrowser::copySuccess); + connect(mCopyWorker, &CopyWorker::file, this, &ArchiveBrowser::setCopyFile); } void ArchiveBrowser::browserSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { QModelIndexList selectedIdx = selectedRows(selected); QModelIndexList deselectedIdx = selectedRows(deselected); - foreach(QModelIndex sel, selectedIdx){ + for(const QModelIndex &sel : selectedIdx){ mSelectedSize += sel.data(ArchiveBrowserModel::TotalSizeRole).toDouble(); ++mSelectedItems; mModel->setData(sel, true, ArchiveBrowserModel::SelectedRole); } - foreach(QModelIndex desel, deselectedIdx){ + for(const QModelIndex &desel : deselectedIdx){ mSelectedSize -= desel.data(ArchiveBrowserModel::TotalSizeRole).toDouble(); --mSelectedItems; mModel->setData(desel, false, ArchiveBrowserModel::SelectedRole); @@ -136,14 +136,14 @@ void ArchiveBrowser::moveToBurn() { int retval = QMessageBox::question(this, tr("Question"), msg, QMessageBox::Yes | QMessageBox::No); if(retval == QMessageBox::Yes){ QList<int> filesToUpdate; - foreach(QModelIndex idx, sel){ + for(const QModelIndex &idx : sel){ QString dirName = idx.data(ArchiveBrowserModel::NameRole).toString(); dirName.replace(' ', '.'); burnDir.mkdir(dirName); QString burnDirS = QString("%1/%2").arg(destDirS).arg(dirName); QModelIndex real = mProxy->mapToSource(idx); QModelIndexList children = mModel->children(real); - foreach(QModelIndex child, children){ + for(const QModelIndex &child : children){ QFileInfo current(child.data(ArchiveBrowserModel::FullPathRole).toString()); int type = child.data(ArchiveBrowserModel::FileTypeRole).toInt(); QString destination = QString("%1/%2").arg(burnDirS).arg(current.fileName()); @@ -196,7 +196,7 @@ void ArchiveBrowser::moveToUSB(){ if(retval == QMessageBox::Yes){ mCopyWorker->clear(); QDir finalD(finalDir); - foreach(QModelIndex idx, sel){ + for(const QModelIndex &idx : sel){ QString dirName = idx.data(ArchiveBrowserModel::NameRole).toString(); dirName.replace(' ', '.'); // this one .../DVD_123/series_name @@ -204,7 +204,7 @@ void ArchiveBrowser::moveToUSB(){ finalD.mkdir(dirName); QModelIndex real = mProxy->mapToSource(idx); QModelIndexList children = mModel->children(real); - foreach(QModelIndex child, children){ + for(const QModelIndex &child : children){ QString source = child.data(ArchiveBrowserModel::FullPathRole).toString(); QFileInfo sFi(source); QString destination = QString("%1/%2/%3").arg(finalDir).arg(dirName).arg(sFi.fileName()); @@ -214,7 +214,7 @@ void ArchiveBrowser::moveToUSB(){ } } mUSBProgress = new QProgressDialog(this); - connect(mCopyWorker, SIGNAL(bytesRead(int)), mUSBProgress, SLOT(setValue(int))); + connect(mCopyWorker, &CopyWorker::bytesRead, mUSBProgress, &QProgressDialog::setValue); mUSBProgress->setLabelText(tr("Copying files...")); mUSBProgress->setMinimum(0); mUSBProgress->setMaximum(mCopyWorker->max()); @@ -231,10 +231,10 @@ void ArchiveBrowser::playSelected(){ QPair<QString, QStringList> pgdata = Helper::programData("movieviewer"); QModelIndexList sel = mTree->selectionModel()->selectedRows(); QStringList movieFiles; - foreach(QModelIndex idx, sel){ + for(const QModelIndex &idx : sel){ QModelIndex real = mProxy->mapToSource(idx); QModelIndexList children = mModel->children(real); - foreach(QModelIndex ci, children){ + for(const QModelIndex &ci : children){ if(ci.data(ArchiveBrowserModel::FileTypeRole).toInt() == 1){ movieFiles << ci.data(ArchiveBrowserModel::FullPathRole).toString(); } @@ -269,9 +269,9 @@ void ArchiveBrowser::itemDoubleClicked(QModelIndex cur){ void ArchiveBrowser::setupQualityFilter(){ mQualityFilter->clear(); QList<int> qualities = mModel->availableQualities(); - qSort(qualities); + std::sort(qualities.begin(), qualities.end()); QStringList qualityList = QStringList() << tr("(none)"); - foreach(int q, qualities){ + for(int q : qualities){ qualityList << QString::number(q); } mQualityFilter->addItems(qualityList); @@ -306,7 +306,7 @@ void ArchiveBrowser::copySuccess(QString success){ if(q == QMessageBox::Yes){ QHash<QString, QList<QVariant> > data = mCopyWorker->data(); QList<int> filesToUpdate; - foreach(QString source, data.keys()){ + for(const QString &source : data.keys()){ int ft = data.value(source).at(0).toInt(); if(ft == FT_MOVIE){ QFile::remove(source); @@ -329,7 +329,7 @@ void ArchiveBrowser::setCopyFile(QString file){ QModelIndexList ArchiveBrowser::selectedRows(const QItemSelection &sel){ QModelIndexList retval; QModelIndexList selIdx = sel.indexes(); - foreach(QModelIndex idx, selIdx){ + for(const QModelIndex &idx : selIdx){ QModelIndex real = mProxy->mapToSource(idx); if(real.column() == 0){ retval << real; |