Modernize filewidget.cpp

Convert to type safe connect syntax and remove Q_FOREACH. Hopefully no
functional changes :)

1 files changed, 28 insertions, 28 deletions

diff --git a/filewidget.cpp b/filewidget.cpp
index 3d2ff28..a60f48b 100644
--- a/filewidget.cpp
+++ b/filewidget.cpp
@@ -48,12 +48,12 @@ FileWidget::FileWidget(QWidget *parent) : QWidget(parent), mCopyToMenu(0) {
     mCopyProgress = new ProgressDialog;
     mFileCache.setMaxCost(500);
     readCache();
-    connect(mFileCopier, SIGNAL(newFile(QString,QString,qint64)), this, SLOT(setupProgress(QString,QString,qint64)));
-    connect(mFileCopier, SIGNAL(bytesRead(qint64)), this, SLOT(setCopyProgress(qint64)));
-    connect(mFileCopier, SIGNAL(bytesReadIntval(qint64,qint64)), this, SLOT(setCopySummary(qint64,qint64)));
-    connect(mFileCopier, SIGNAL(finished()), this, SLOT(hideCopyProgress()));
-    connect(mFileCopier, SIGNAL(success(bool,QString)), this, SLOT(copySuccess(bool,QString)));
-    connect(mCopyProgress, SIGNAL(cancelled()), this, SLOT(hideCopyProgress()));
+    connect(mFileCopier, &FileCopier::newFile, this, &FileWidget::setupProgress);
+    connect(mFileCopier, &FileCopier::bytesRead, this, &FileWidget::setCopyProgress);
+    connect(mFileCopier, &FileCopier::bytesReadIntval, this, &FileWidget::setCopySummary);
+    connect(mFileCopier, &FileCopier::finished, this, &FileWidget::hideCopyProgress);
+    connect(mFileCopier, &FileCopier::success, this, &FileWidget::copySuccess);
+    connect(mCopyProgress, &ProgressDialog::cancelled, this, &FileWidget::hideCopyProgress);
     setupGui();
 }
 
@@ -70,14 +70,14 @@ void FileWidget::setupGui(){
     fsCompleter->setModel(dirModel);
     fsCompleter->setCompletionMode(QCompleter::PopupCompletion);
     mDir->setCompleter(fsCompleter);
-    connect(mDir, SIGNAL(returnPressed()), this, SLOT(gatherData()));
+    connect(mDir, &QLineEdit::returnPressed, this, &FileWidget::gatherData);
     QPushButton *selDirBtn = new QPushButton(tr("&Browse..."));
-    connect(selDirBtn, SIGNAL(clicked()), this, SLOT(selectDir()));
+    connect(selDirBtn, &QPushButton::clicked, this, &FileWidget::selectDir);
 
     mFilter = new QLineEdit;
-    connect(mFilter, SIGNAL(returnPressed()), this, SLOT(filter()));
+    connect(mFilter, &QLineEdit::returnPressed, this, &FileWidget::filter);
     QPushButton *searchBtn = new QPushButton(tr("F&ilter"));
-    connect(searchBtn, SIGNAL(clicked()), this, SLOT(filter()));
+    connect(searchBtn, &QPushButton::clicked, this, &FileWidget::filter);
 
     QGridLayout *topL = new QGridLayout;
     topL->addWidget(new QLabel(tr("Directory")), 0, 0);
@@ -92,7 +92,7 @@ void FileWidget::setupGui(){
     mFileView->setUniformRowHeights(true);
     mFileView->setSelectionBehavior(QAbstractItemView::SelectRows);
     mFileView->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    connect(mFileView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(properties(QModelIndex)));
+    connect(mFileView, &QTreeView::doubleClicked, this, QOverload<const QModelIndex &>::of(&FileWidget::properties));
 
     mModel = new QStandardItemModel;
     mProxy = new VideoSorter;
@@ -111,8 +111,8 @@ void FileWidget::setupGui(){
 
     mFileDisplay = new FileDisplay(this);
     mOrignDlg = new OriginDialog(this);
-    connect(mOrignDlg, SIGNAL(statusMessage(QString)), this, SIGNAL(statusMessage(QString)));
-    connect(mOrignDlg, SIGNAL(refreshNeeded()), this, SLOT(gatherData()));
+    connect(mOrignDlg, &OriginDialog::statusMessage, this, &FileWidget::statusMessage);
+    connect(mOrignDlg, &OriginDialog::refreshNeeded, this, &FileWidget::gatherData);
     mMenuBar = new QMenuBar;
     mToolBar = new QToolBar;
     mToolBar->setIconSize(QSize(16, 16));
@@ -125,7 +125,7 @@ void FileWidget::setupGui(){
     mainLayout->addWidget(mFileView);
     setLayout(mainLayout);
 
-    connect(mFileView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(fileSelectionChanged(QItemSelection,QItemSelection)));
+    connect(mFileView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &FileWidget::fileSelectionChanged);
     createActions();
     mMimeData = new QMimeData;
     mFileView->setFocus();
@@ -136,35 +136,35 @@ void FileWidget::createActions(){
     mCopyToMenu = new QMenu;
     mSelDirA = new QAction(QIcon(":/folder.png"), tr("Select Folder..."), this);
     mSelDirA->setShortcut(tr("CTRL+O"));
-    connect(mSelDirA, SIGNAL(triggered()), this, SLOT(selectDir()));
+    connect(mSelDirA, &QAction::triggered, this, &FileWidget::selectDir);
     mRefreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"), this);
     mRefreshA->setShortcut(tr("CTRL+R"));
-    connect(mRefreshA, SIGNAL(triggered()), this, SLOT(gatherData()));
+    connect(mRefreshA, &QAction::triggered, this, &FileWidget::gatherData);
     mDirUpA = new QAction(QIcon(":/up_dick.png"), tr("Dir up"), this);
     mDirUpA->setShortcut(Qt::Key_Backspace);
-    connect(mDirUpA, SIGNAL(triggered()), this, SLOT(cdUp()));
+    connect(mDirUpA, &QAction::triggered, this, &FileWidget::cdUp);
     mDirBackA = new QAction(QIcon(":/back_dick.png"), tr("Back"), this);
     mDirBackA->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Left));
-    connect(mDirBackA, SIGNAL(triggered()), this, SLOT(cdLast()));
+    connect(mDirBackA, &QAction::triggered, this, &FileWidget::cdLast);
     mCopyA = new QAction(QIcon(":/edit-copy.png"), tr("Copy"), this);
     mCopyA->setShortcut(tr("CTRL+C"));
-    connect(mCopyA, SIGNAL(triggered()), this, SLOT(copy()));
+    connect(mCopyA, &QAction::triggered, this, &FileWidget::copy);
     mCutA = new QAction(QIcon(":/edit-cut.png"), tr("Cut"), this);
     mCutA->setShortcut(tr("CTRL+X"));
-    connect(mCutA, SIGNAL(triggered()), this, SLOT(cut()));
+    connect(mCutA, &QAction::triggered, this, &FileWidget::cut);
     mPasteA = new QAction(QIcon(":/edit-paste.png"), tr("Paste"), this);
     mPasteA->setShortcut(tr("CTRL+V"));
-    connect(mPasteA, SIGNAL(triggered()), this, SLOT(paste()));
+    connect(mPasteA, &QAction::triggered, this, &FileWidget::paste);
     mDeleteA = new QAction(QIcon(":/delete.png"), tr("Delete..."), this);
     mDeleteA->setShortcut(Qt::Key_Delete);
-    connect(mDeleteA, SIGNAL(triggered()), this, SLOT(deleteFiles()));
+    connect(mDeleteA, &QAction::triggered, this, &FileWidget::deleteFiles);
     mPropertiesA = new QAction(QIcon(":/diaper.png"), tr("Properties..."), this);
     mPropertiesA->setShortcut(Qt::CTRL + Qt::Key_Return);
-    connect(mPropertiesA, SIGNAL(triggered()), this, SLOT(properties()));
+    connect(mPropertiesA, &QAction::triggered, this, QOverload<>::of(&FileWidget::properties));
     mPreviewA = new QAction(QIcon(":/snapshot.png"), tr("Preview..."), this);
-    connect(mPreviewA, SIGNAL(triggered()), this, SLOT(preview()));
+    connect(mPreviewA, &QAction::triggered, this, &FileWidget::preview);
     mAddAsOriginA = new QAction(QIcon(":/butt_plug.png"), tr("Add as Origin..."), this);
-    connect(mAddAsOriginA, SIGNAL(triggered()), this, SLOT(addAsOrigin()));
+    connect(mAddAsOriginA, &QAction::triggered, this, &FileWidget::addAsOrigin);
     mRemoveFromCacheA = new QAction(QIcon(":/bizarre_amputee.png"), tr("Remove selected"), this);
     connect(mRemoveFromCacheA, &QAction::triggered, this, &FileWidget::removeFromCache);
     mClearCacheA = new QAction(QIcon(":/male_chastity_belt.png"), tr("Clear..."), this);
@@ -439,7 +439,7 @@ void FileWidget::cutOrCopy(){
     mMimeData->clear();
     QModelIndexList idxL = mFileView->selectionModel()->selectedRows(NameColumn);
     QList<QUrl> files;
-    foreach(QModelIndex i, idxL){
+    for(const QModelIndex &i : idxL){
         QUrl url = QUrl::fromLocalFile(i.data(FullPathRole).toString());
         files << url;
     }
@@ -600,7 +600,7 @@ void FileWidget::setCopySummary(qint64 bytes, qint64 elapsed){
 void FileWidget::copyFiles(QString destDir){
     QModelIndexList files = mFileView->selectionModel()->selectedRows();
     if(!files.isEmpty()){
-        foreach(auto idx, files){
+        for(const QModelIndex &idx : files){
             QString fp = idx.data(FullPathRole).toString();
             QFileInfo fi(fp);
             if(!fi.exists() || fi.isDir()){
@@ -674,7 +674,7 @@ void FileWidget::fileSelectionChanged(const QItemSelection &selected, const QIte
     emit selectionCountChanged(msg);
     QModelIndexList idxl = mFileView->selectionModel()->selectedRows(DurationColumn);
     qint64 seconds = 0;
-    foreach(QModelIndex idx, idxl){
+    for(const QModelIndex &idx : idxl){
         seconds += idx.data(SecondsRole).toLongLong();
     }
     Helper::Duration dur(seconds);