Another round of Clang fixes...

12 files changed, 51 insertions, 51 deletions

diff --git a/configurationwidget.cpp b/configurationwidget.cpp
index a4af77d..60bd5a7 100644
--- a/configurationwidget.cpp
+++ b/configurationwidget.cpp
@@ -39,19 +39,19 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) : QDialog(parent), mCo
     extL->addWidget(new QLabel(tr("ffprobe")), 0, 0);
     extL->addWidget(mFfProbe, 0, 1);
     QPushButton *browseFfProbeBtn = new QPushButton(tr("Browse..."));
-    connect(browseFfProbeBtn, &QPushButton::clicked, [=] { browsePathforLE(mFfProbe); });
+    connect(browseFfProbeBtn, &QPushButton::clicked, this, [=] { browsePathforLE(mFfProbe); });
     extL->addWidget(browseFfProbeBtn, 0, 2);
     mFfMpeg = new QLineEdit;
     extL->addWidget(new QLabel(tr("ffmpeg")), 1, 0);
     extL->addWidget(mFfMpeg, 1, 1);
     QPushButton *browseFfMpegBtn = new QPushButton(tr("Browse..."));
-    connect(browseFfMpegBtn, &QPushButton::clicked, [=] { browsePathforLE(mFfMpeg); });
+    connect(browseFfMpegBtn, &QPushButton::clicked, this, [=] { browsePathforLE(mFfMpeg); });
     extL->addWidget(browseFfMpegBtn, 1, 2);
     mMkvInfo = new QLineEdit;
     extL->addWidget(new QLabel(tr("mkvinfo")), 2, 0);
     extL->addWidget(mMkvInfo, 2, 1);
     QPushButton *browsemkvBtn = new QPushButton(tr("Browse..."));
-    connect(browsemkvBtn, &QPushButton::clicked, [=] { browsePathforLE(mMkvInfo); });
+    connect(browsemkvBtn, &QPushButton::clicked, this, [=] { browsePathforLE(mMkvInfo); });
     extL->addWidget(browsemkvBtn, 2, 2);
     extL->setAlignment(Qt::AlignTop);
     QWidget *extWidget = new QWidget;
@@ -73,16 +73,16 @@ ConfigurationWidget::ConfigurationWidget(QWidget *parent) : QDialog(parent), mCo
     mBaseColorL->setScaledContents(true);
     QPushButton *baseColorB = new QPushButton(tr("Choose..."));
     baseColorB->setDisabled(true);
-    connect(baseColorB, &QPushButton::clicked, [=] { chooseColor(mBaseColorL, 0); });
+    connect(baseColorB, &QPushButton::clicked, this, [=] { chooseColor(mBaseColorL, 0); });
     QLabel *altColorT = new QLabel(tr("Alternate color"));
     mAltColorL = new QLabel;
     mAltColorL->setFrameStyle(QFrame::Sunken | QFrame::Panel);
     mAltColorL->setScaledContents(true);
     QPushButton *altColorB = new QPushButton(tr("Choose..."));
     altColorB->setDisabled(true);
-    connect(altColorB, &QPushButton::clicked, [=] { chooseColor(mAltColorL, 1); });
+    connect(altColorB, &QPushButton::clicked, this, [=] { chooseColor(mAltColorL, 1); });
     mUseAltColors = new QCheckBox(tr("Use alternating colors"));
-    connect(mUseAltColors, &QCheckBox::stateChanged, [=]{
+    connect(mUseAltColors, &QCheckBox::stateChanged, this, [=]{
        baseColorB->setEnabled(mUseAltColors->isChecked());
        altColorB->setEnabled(mUseAltColors->isChecked());
     });
diff --git a/filecopier.cpp b/filecopier.cpp
index a77e051..049d8bd 100644
--- a/filecopier.cpp
+++ b/filecopier.cpp
@@ -23,17 +23,17 @@ void FileCopier::run(){
         auto dest = first.value();
         mJobs.remove(source);
         mAddJobMutex.unlock();
-        QString msg = QString(tr("Copy: %1 (%2/%3)")).arg(source).arg(QString::number(mCopied + 1)).arg(QString::number(mTotal));
-        QString cmsg = QString("%1/%2").arg(QString::number(mCopied + 1)).arg(QString::number(mTotal));
+        QString msg = QString(tr("Copy: %1 (%2/%3)")).arg(source, QString::number(mCopied + 1), QString::number(mTotal));
+        QString cmsg = QString("%1/%2").arg(QString::number(mCopied + 1), QString::number(mTotal));
         emit copying(cmsg);
         emit message(msg);
         QFile sFile(source);
         if(sFile.copy(dest)){
             ++mCopied;
-            QString msg = QString(tr("Copied file %1/%2").arg(QString::number(mCopied)).arg(QString::number(mTotal)));
+            QString msg = QString(tr("Copied file %1/%2").arg(QString::number(mCopied), QString::number(mTotal)));
             emit message(msg);
         }else{
-            QString msg = QString(tr("Failed to copy %1: %2").arg(source).arg(sFile.errorString()));
+            QString msg = QString(tr("Failed to copy %1: %2").arg(source, sFile.errorString()));
             emit message(msg);
         }
         QMutexLocker l(&mCancelMutex);
diff --git a/filedisplay.cpp b/filedisplay.cpp
index 199b4e6..0a25ee0 100644
--- a/filedisplay.cpp
+++ b/filedisplay.cpp
@@ -224,7 +224,7 @@ void FileData::setFileData(const QString &fullPath){
     FileDataRecursive(jObject.value("format"), formatItem);
     QJsonArray streams = jObject.value("streams").toArray();
     for(int i = 0; i < streams.size(); ++i){
-        QString itemName = QString(tr("Stream %1 [%2]")).arg(QString::number(i + 1)).arg(streams.at(i).toObject().value("codec_type").toString());
+        QString itemName = QString(tr("Stream %1 [%2]")).arg(QString::number(i + 1), streams.at(i).toObject().value("codec_type").toString());
         QStandardItem *item = new QStandardItem(itemName);
         item->setEditable(false);
         QStandardItem *item2 = new QStandardItem;
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);
         }
     }
diff --git a/helper.cpp b/helper.cpp
index fa96939..30c8eb2 100644
--- a/helper.cpp
+++ b/helper.cpp
@@ -131,7 +131,7 @@ namespace Helper {
             QString homeDir = QStandardPaths::locate(QStandardPaths::HomeLocation, QString(), QStandardPaths::LocateDirectory);
             QDir d(homeDir);
             if(d.mkdir(".shemovcleaner")){
-                retval = QString("%1/%2").arg(homeDir).arg(".shemovcleaner");
+                retval = QString("%1/%2").arg(homeDir, ".shemovcleaner");
             }
         }
         return retval;
diff --git a/itemselectionwidget.cpp b/itemselectionwidget.cpp
index 1349de3..08904f7 100644
--- a/itemselectionwidget.cpp
+++ b/itemselectionwidget.cpp
@@ -40,7 +40,7 @@ ItemSelectionWidget::ItemSelectionWidget(int mode, QString labelText, QWidget *p
     addRemL->addStretch();
     addRemL->addWidget(addBtn);
     addRemL->addWidget(removeBtn);
-    connect(mView->selectionModel(), &QItemSelectionModel::currentChanged, [=](const QModelIndex &cur) { mItem->setText(cur.data().toString()); });
+    connect(mView->selectionModel(), &QItemSelectionModel::currentChanged, this, [=](const QModelIndex &cur) { mItem->setText(cur.data().toString()); });
     QVBoxLayout *newDirTabL = new QVBoxLayout;
     newDirTabL->addLayout(newItemL);
     newDirTabL->addLayout(addRemL);
diff --git a/searchdialog.cpp b/searchdialog.cpp
index fc01ccb..a6a0c58 100644
--- a/searchdialog.cpp
+++ b/searchdialog.cpp
@@ -121,7 +121,7 @@ void SearchDialog::doSearchTitle(){
     if(mSearch->text().isEmpty()){
         return;
     }
-    QString title = QString(tr("%1 Search [Title: %2]")).arg(qApp->applicationName()).arg(mSearch->text());
+    QString title = QString(tr("%1 Search [Title: %2]")).arg(qApp->applicationName(), mSearch->text());
     setWindowTitle(title);
     mResV->setSortingEnabled(false);
     mResM->clear();
@@ -149,7 +149,7 @@ void SearchDialog::doSearchFilename(){
     if(mSearch->text().isEmpty()){
         return;
     }
-    QString title = QString(tr("%1 Search [Filename: %2]")).arg(qApp->applicationName()).arg(mSearch->text());
+    QString title = QString(tr("%1 Search [Filename: %2]")).arg(qApp->applicationName(), mSearch->text());
     setWindowTitle(title);
     mResV->setSortingEnabled(false);
     mResM->clear();
@@ -189,7 +189,7 @@ void SearchDialog::doSearchActor(){
     if(mSearch->text().isEmpty()){
         return;
     }
-    QString title = QString(tr("%1 Search [Actor: %2]")).arg(qApp->applicationName()).arg(mSearch->text());
+    QString title = QString(tr("%1 Search [Actor: %2]")).arg(qApp->applicationName(), mSearch->text());
     setWindowTitle(title);
     mResV->setSortingEnabled(false);
     mResM->clear();
@@ -241,7 +241,7 @@ void SearchDialog::doResultName(const QModelIndex &sel, int resType){
             if(sub.isEmpty()){
                 curDisp = QString("%1 - <no sub/part>").arg(rQ.value(0).toString());
             }else{
-                curDisp = QString("%1 - %2").arg(rQ.value(0).toString()).arg(sub);
+                curDisp = QString("%1 - %2").arg(rQ.value(0).toString(), sub);
             }
         }
         QStandardItem *cur = new QStandardItem(curDisp);
@@ -286,7 +286,7 @@ void SearchDialog::doResultActor(const QModelIndex &sel){
                 if(sub.isEmpty()){
                     curDisp = QString("%1 - <no sub/part>").arg(r2Q.value(0).toString());
                 }else{
-                    curDisp = QString("%1 - %2").arg(r2Q.value(0).toString()).arg(sub);
+                    curDisp = QString("%1 - %2").arg(r2Q.value(0).toString(), sub);
                 }
             }
             QStandardItem *cur = new QStandardItem(curDisp);
@@ -379,7 +379,7 @@ void SearchDialog::doChild(QStandardItem *item, int childMode){
         QStandardItem *aItem = new QStandardItem(parentName);
         aItem->setEditable(false);
         aItem->setIcon(aIcon);
-        for(QString a : res){
+        for(const auto &a : res){
             QStandardItem *curItem = new QStandardItem(a);
             curItem->setIcon(aIcon);
             curItem->setEditable(false);
@@ -402,7 +402,7 @@ void SearchDialog::doActorGenres(QStandardItem *item){
     }
     if(!res.isEmpty()){
         std::sort(res.begin(), res.end());
-        for(QString s : res){
+        for(const auto &s : res){
             QStandardItem *cur = new QStandardItem(s);
             cur->setIcon(aIcon);
             cur->setEditable(false);
diff --git a/shemovcleaner.cpp b/shemovcleaner.cpp
index 149f9f6..3c0831c 100644
--- a/shemovcleaner.cpp
+++ b/shemovcleaner.cpp
@@ -68,7 +68,7 @@ ShemovCleaner::ShemovCleaner(QWidget *parent) : QMainWindow(parent) {
     connect(mTab, &QTabWidget::currentChanged, this, &ShemovCleaner::tabChanged);
     connect(this, &ShemovCleaner::configurationChanged, mFileTab, &FileWidget::readSettings);
     connect(mFileTab->fileCopier(), &FileCopier::copying, this, &ShemovCleaner::updateCopying);
-    connect(mFileTab->fileCopier(), &FileCopier::finished, [=] { updateCopying(QString());} );
+    connect(mFileTab->fileCopier(), &FileCopier::finished, this, [=] { updateCopying(QString());} );
     connect(mFileTab->fileCopier(), &FileCopier::finished, mFileTab, &FileWidget::gatherData);
     mCopying->installEventFilter(this);
     updateCopying(QString());
@@ -113,7 +113,7 @@ void ShemovCleaner::updateFreeSpace(const QString &path){
         drive.chop(1);
     }
     mDrive->setText(drive);
-    QString textFree = QString(tr("%1/%2GB free")).arg(QString::number(si.bytesFree() / 1024 / 1024 / 1024)).arg(QString::number(si.bytesTotal() / 1024 / 1024 / 1024));
+    QString textFree = QString(tr("%1/%2GB free")).arg(QString::number(si.bytesFree() / 1024 / 1024 / 1024), QString::number(si.bytesTotal() / 1024 / 1024 / 1024));
     mFree->setText(textFree);
 }
 
@@ -152,11 +152,11 @@ void ShemovCleaner::tabChanged(int idx){
     if(idx == Torrents){
         setDuration("00:00:00");
         updateFreeSpace(mTorrentTab->currentDir());
-        winTitle = QString(tr("%1 Torrents [%2]")).arg(qApp->applicationName()).arg(mTorrentTab->currentDir());
+        winTitle = QString(tr("%1 Torrents [%2]")).arg(qApp->applicationName(), mTorrentTab->currentDir());
     }else if(idx == Videos){
         mFileTab->fileView()->setFocus();
         updateFreeSpace(mFileTab->currentDir());
-        winTitle = QString(tr("%1 Files [%2]")).arg(qApp->applicationName()).arg(mFileTab->currentDir());
+        winTitle = QString(tr("%1 Files [%2]")).arg(qApp->applicationName(), mFileTab->currentDir());
     }
     setWindowTitle(winTitle);
 }
diff --git a/torrentdisplay.cpp b/torrentdisplay.cpp
index d018c31..085ee7a 100644
--- a/torrentdisplay.cpp
+++ b/torrentdisplay.cpp
@@ -99,7 +99,7 @@ void TorrentDisplay::setData(const QList<QVariant> data, const QString &filename
     mAnnounceModel->clear();
     mAnnounceModel->setHorizontalHeaderLabels(QStringList() << tr("Tracker"));
 
-    for(QVariant cur : data){
+    for(const auto &cur : data){
         if(cur.canConvert<QVariantHash>()){
             QVariantHash h = cur.toHash();
             QHash<QString, QVariant>::const_iterator it = h.constBegin();
@@ -131,9 +131,9 @@ void TorrentDisplay::setData(const QList<QVariant> data, const QString &filename
                 //this is a list of lists
                 if(it.key() == "announce-list"){
                     QVariantList l1 = it.value().toList();
-                    for(QVariant l2 : l1){
+                    for(const auto &l2 : l1){
                         QVariantList l3 = l2.toList();
-                        for(QVariant ann : l3){
+                        for(const auto &ann : l3){
                             QStandardItem *i1 = new QStandardItem(ann.toString());
                             i1->setIcon(QIcon(":/butt_plug.png"));
                             mAnnounceModel->invisibleRootItem()->appendRow(QList<QStandardItem*>() << i1);
@@ -171,7 +171,7 @@ void TorrentDisplay::setMulti(const QVariantHash &data, const QString &filename)
     folderItem->setIcon(QIcon(":/gaping_ass.png"));
     torrentItem->appendRow(QList<QStandardItem*>() << folderItem << new QStandardItem);
     QVariantList fileList = data.value("files").toList();
-    for(QVariant entry : fileList){
+    for(const auto &entry : fileList){
         QVariantHash e = entry.toHash();
         QVariantList path = e.value("path").toList();
         QStandardItem *i1 = new QStandardItem(path.last().toString());
diff --git a/torrentparser.cpp b/torrentparser.cpp
index f0326d4..547992e 100644
--- a/torrentparser.cpp
+++ b/torrentparser.cpp
@@ -22,7 +22,7 @@ const QList<QVariant> TorrentParser::parse(){
 
 const QStringList TorrentParser::files(QList<QVariant> data){
     QStringList retval;
-    for(QVariant cur : data){
+    for(const auto &cur : data){
         if(cur.canConvert<QVariantHash>()){
             QVariantHash h = cur.toHash();
             QHash<QString, QVariant>::const_iterator it = h.constBegin();
@@ -31,7 +31,7 @@ const QStringList TorrentParser::files(QList<QVariant> data){
                     QVariantHash infoD = it.value().toHash();
                     if(infoD.contains("files")){
                         QVariantList fileList = infoD.value("files").toList();
-                        for(QVariant fn : fileList){
+                        for(const auto &fn : fileList){
                             QVariantHash e = fn.toHash();
                             QVariantList path = e.value("path").toList();
                             retval << path.last().toString();
diff --git a/torrentwidget.cpp b/torrentwidget.cpp
index a2ba78f..ec83424 100644
--- a/torrentwidget.cpp
+++ b/torrentwidget.cpp
@@ -179,7 +179,7 @@ void TorrentWidget::gatherData(){
     mModel->setHorizontalHeaderLabels(QStringList() << QChar(0x26A7) << tr("Name") << tr("Created"));
     QBrush redBrush(Qt::red);
     QBrush greenBrush(Qt::darkGreen);
-    for(QFileInfo fi : fl){
+    for(const auto &fi : fl){
         QList<QStandardItem*> fData;
         for(int i = 0; i < ColumnCount; ++i){
             QStandardItem *item = new QStandardItem;
@@ -244,7 +244,7 @@ void TorrentWidget::deleteFiles(){
                 mModel->removeRow(res.at(0)->row());
             }
         }
-        QString msg = QString(tr("Successfully deleted %1 of %2 file(s)")).arg(QString::number(ctr)).arg(QString::number(sel.count()));
+        QString msg = QString(tr("Successfully deleted %1 of %2 file(s)")).arg(QString::number(ctr), QString::number(sel.count()));
         emit statusMessage(msg);
         emit freeSpaceChanged(mDir->text());
     }
@@ -264,7 +264,7 @@ void TorrentWidget::moveFiles(){
         QStringList removed;
         for(const QModelIndex &i : sel){
             QFileInfo fp(i.data(FullPathRole).toString());
-            QString newfn = QString("%1/%2").arg(dir).arg(fp.fileName());
+            QString newfn = QString("%1/%2").arg(dir, fp.fileName());
             bool ok = QFile::rename(fp.absoluteFilePath(), newfn);
             if(ok){
                 ++ctr;
@@ -284,7 +284,7 @@ void TorrentWidget::moveFiles(){
                 mModel->removeRow(res.at(0)->row());
             }
         }
-        QString msg = QString(tr("Successfully moved %1 of %2 file(s)")).arg(QString::number(ctr)).arg(QString::number(sel.count()));
+        QString msg = QString(tr("Successfully moved %1 of %2 file(s)")).arg(QString::number(ctr), QString::number(sel.count()));
         emit statusMessage(msg);
         emit freeSpaceChanged(mDir->text());
     }
@@ -317,7 +317,7 @@ void TorrentWidget::searchFile(){
         emit statusMessage(QString(tr("parsing %1").arg(fn)));
         QList<QVariant> torrentData = p.parse();
         QStringList files = p.files(torrentData);
-        for(QString f : files){
+        for(const auto &f : files){
             QRegularExpressionMatch m = regex.match(f);
             if(m.hasMatch()){
                 ++success;
@@ -391,7 +391,7 @@ void TorrentWidget::fileSelectionChanged(const QItemSelection &selected, const Q
     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);
 }
 
@@ -445,7 +445,7 @@ void TorrentWidget::rememberSelection(){
 
 void TorrentWidget::restoreSelection(){
     QList<QStandardItem*> modelItems;
-    for(QString sel : mSelection){
+    for(const auto &sel : mSelection){
         modelItems << mModel->findItems(sel, Qt::MatchExactly, NameColumn);
     }
     for(QStandardItem *i : modelItems){
diff --git a/viewer.cpp b/viewer.cpp
index 8025401..aa0e7b7 100644
--- a/viewer.cpp
+++ b/viewer.cpp
@@ -26,7 +26,7 @@ void Viewer::setFile(const QString &file, bool allFiles){
         mFiles << fi.absoluteFilePath();
     }
     if(allFiles){
-        for(auto curFi : fi.dir().entryInfoList()){
+        for(const auto &curFi : fi.dir().entryInfoList()){
             if(!mFiles.contains(curFi.absoluteFilePath())){
                 QMimeType mt = db.mimeTypeForFile(curFi);
                 if(mt.name().startsWith("image")){
@@ -46,7 +46,7 @@ void Viewer::preview(const QString &file){
     mCurIndex = -1;
     QPixmap pm = Helper::preview(file);
     mLabel->setPixmap(pm);
-    QString winTitle = QString(tr("%1 Viewer: [Preview %2]")).arg(qApp->applicationName()).arg(file);
+    QString winTitle = QString(tr("%1 Viewer: [Preview %2]")).arg(qApp->applicationName(), file);
     setWindowTitle(winTitle);
     adjustSize();
 }
@@ -87,7 +87,7 @@ void Viewer::displayFile(int index){
     }
     mLabel->setPixmap(pm);
     adjustSize();
-    QString winTitle = QString(tr("%1 Viewer [%2]")).arg(qApp->applicationName()).arg(mFiles.at(mCurIndex));
+    QString winTitle = QString(tr("%1 Viewer [%2]")).arg(qApp->applicationName(), mFiles.at(mCurIndex));
     setWindowTitle(winTitle);
     setFixedSize(size());
 }