diff options
Diffstat (limited to 'filewidget.cpp')
| -rw-r--r-- | filewidget.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/filewidget.cpp b/filewidget.cpp index d518867..fb8c83d 100644 --- a/filewidget.cpp +++ b/filewidget.cpp @@ -77,13 +77,13 @@ void FileWidget::setupGui(){ connect(mFavDirs, &QComboBox::textActivated, this, [=](const QString &text) { cdAbsolute(text); }); mFilter = new QLineEdit; - connect(mFilter, &QLineEdit::returnPressed, [this] { filter(NameColumn, mFilter->text()); }); + connect(mFilter, &QLineEdit::returnPressed, this, [this] { filter(NameColumn, mFilter->text()); }); QPushButton *searchBtn = new QPushButton(tr("F&ilter")); - connect(searchBtn, &QPushButton::clicked, [this] { filter(NameColumn, mFilter->text()); }); + connect(searchBtn, &QPushButton::clicked, this, [this] { filter(NameColumn, mFilter->text()); }); mMimeFilters = new QComboBox; populateMimeFilters(); connect(mMimeFilters, &QComboBox::textActivated, this, [this](const QString &text) { filter(MimeColumn, text); }); - connect(mMimeFilters, &QComboBox::currentTextChanged, [this](const QString &text) { filter(MimeColumn, text); }); + connect(mMimeFilters, &QComboBox::currentTextChanged, this, [this](const QString &text) { filter(MimeColumn, text); }); QGridLayout *topL = new QGridLayout; topL->addWidget(new QLabel(tr("Directory")), 0, 0); @@ -291,7 +291,7 @@ void FileWidget::gatherData(){ QDirIterator it(mDir->text(), QDir::Files | QDir::Dirs | QDir::NoDot); while(it.hasNext()){ QFileInfo fi(it.next()); - emit statusMessage(gatherMsg.arg(fi.fileName()).arg(QString::number(count))); + emit statusMessage(gatherMsg.arg(fi.fileName(), QString::number(count))); CachedFileData *fd = mFileCache[fi.absoluteFilePath()]; if(!fd){ bool insert = true; @@ -364,7 +364,7 @@ void FileWidget::gatherData(){ qApp->restoreOverrideCursor(); selectFirst(); double totalSizeGB = totalSize / 1024 / 1024 / 1024.0; - emit statusMessage(QString(tr("Analyzed %1 file(s) / (%2 GB)").arg(QString::number(count)).arg(QString::number(totalSizeGB, 'f', 2)))); + emit statusMessage(QString(tr("Analyzed %1 file(s) / (%2 GB)").arg(QString::number(count), QString::number(totalSizeGB, 'f', 2)))); emit freeSpaceChanged(mDir->text()); } @@ -475,7 +475,7 @@ void FileWidget::writeSettings(){ void FileWidget::readCache(){ QString cacheDir = Helper::appDataDir(); if(!cacheDir.isEmpty()){ - QString cacheFile = QString("%1/%2").arg(cacheDir).arg("cfd.dat"); + QString cacheFile = QString("%1/%2").arg(cacheDir, "cfd.dat"); QFile f(cacheFile); if(f.open(QIODevice::ReadOnly)){ QDataStream in(&f); @@ -491,7 +491,7 @@ void FileWidget::readCache(){ void FileWidget::writeCache(){ QString cacheDir = Helper::appDataDir(); if(!cacheDir.isEmpty()){ - QString cacheFile = QString("%1/%2").arg(cacheDir).arg("cfd.dat"); + QString cacheFile = QString("%1/%2").arg(cacheDir, "cfd.dat"); QFile f(cacheFile); if(f.open(QIODevice::WriteOnly)){ QDataStream out(&f); @@ -649,11 +649,11 @@ void FileWidget::paste(){ int count = 0; mProgressBar->reset(); mProgressBar->setMaximum(urls.count() - 1); - for(QUrl u : urls){ + for(const auto &u : urls){ QString path = u.toLocalFile(); QString newDir = mDir->text(); QFileInfo fi(path); - QString newFile = QString("%1/%2").arg(newDir).arg(fi.fileName()); + QString newFile = QString("%1/%2").arg(newDir, fi.fileName()); mProgressBar->setValue(++count); CachedFileData *fd = mFileCache[path]; if(mFileAction == Copy){ @@ -766,7 +766,7 @@ void FileWidget::fileSelectionChanged(const QItemSelection &selected, const QIte Q_UNUSED(deselected); int count = mFileView->selectionModel()->selectedRows().count(); int total = mModel->rowCount(); - QString msg = QString("%1/%2").arg(QString::number(count)).arg(QString::number(total)); + QString msg = QString("%1/%2").arg(QString::number(count), QString::number(total)); emit selectionCountChanged(msg); QModelIndexList idxl = mFileView->selectionModel()->selectedRows(DurationColumn); int seconds = 0; @@ -947,7 +947,7 @@ void FileWidget::contextMenuEvent(QContextMenuEvent *e){ QFileInfo di(d); if(di.exists()){ QAction *copyA = new QAction(di.fileName(), mCopyToMenu); - connect(copyA, &QAction::triggered, [=] { copyFiles(di.absoluteFilePath()); }); + connect(copyA, &QAction::triggered, this, [=] { copyFiles(di.absoluteFilePath()); }); mCopyToMenu->addAction(copyA); } } |