Modernize newpicsdialog.cpp

Use type-safe connect syntax and weed out foreach.

1 files changed, 11 insertions, 11 deletions

diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp
index 7120255..4fe8f42 100644
--- a/newpicsdialog.cpp
+++ b/newpicsdialog.cpp
@@ -64,9 +64,9 @@ void NewPicsDialog::setupDlg(){
 
     //dialog buttons
     mOk = new QPushButton(tr("Ok"));
-    connect(mOk, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(mOk, &QPushButton::clicked, this, &NewPicsDialog::accept);
     mCancel = new QPushButton(tr("Cancel"));
-    connect(mCancel, SIGNAL(clicked()), this, SLOT(reject()));
+    connect(mCancel, &QPushButton::clicked, this, &NewPicsDialog::reject);
     QHBoxLayout *dlgButtonLayout = new QHBoxLayout;
     dlgButtonLayout->addStretch();
     dlgButtonLayout->addWidget(mCancel);
@@ -84,7 +84,7 @@ void NewPicsDialog::setupDlg(){
     setLayout(mainLayout);
 
     mMappingEditWidget->treeWidget()->mappingTreeView()->setFocus();
-    connect(mMappingEditWidget->treeWidget()->mappingTreeView(), SIGNAL(acceptPics()), this, SLOT(accept()));
+    connect(mMappingEditWidget->treeWidget()->mappingTreeView(), &MappingTreeView::acceptPics, this, &NewPicsDialog::accept);
     readSettings();
 }
 
@@ -104,7 +104,7 @@ void NewPicsDialog::addFiles(const QStringList &files){
         return;
     }
     mFilesV->setSortingEnabled(false);
-    foreach(QString f, files){
+    for(QString f : files){
         mFilesModel->addFile(f);
     }
     mFilesV->setSortingEnabled(true);
@@ -124,7 +124,7 @@ void NewPicsDialog::setFile(const QString &file){
 void NewPicsDialog::setDir(const QString &dir){
     mFiles.clear();
     QDir d(dir);
-    foreach(QFileInfo fi, d.entryInfoList(QDir::Files, QDir::Name)){
+    for(QFileInfo fi : d.entryInfoList(QDir::Files, QDir::Name)){
         mFiles << fi.absoluteFilePath();
     }
     mFilesCtr = 0;
@@ -157,14 +157,14 @@ void NewPicsDialog::removeFiles(){
         return;
     }
     QModelIndexList real;
-    foreach(QModelIndex i, selected){
+    for(QModelIndex i : selected){
         real << mFilesProxy->mapToSource(i);
     }
     QList<QPersistentModelIndex> perm;
-    foreach(QModelIndex i, real){
+    for(QModelIndex i : real){
         perm << i;
     }
-    foreach(QPersistentModelIndex pi, perm){
+    for(QPersistentModelIndex pi : perm){
         mFilesModel->removeRows(pi.row(), 1, pi.parent());
     }
 }
@@ -193,7 +193,7 @@ void NewPicsDialog::archive(){
     progress.setMinimumWidth(400);
     progress.show();
     int pgctr = 0;
-    foreach(FileData d, files){
+    for(FileData d : files){
         ++pgctr;
         progress.setValue(pgctr);
         qApp->processEvents();
@@ -209,7 +209,7 @@ void NewPicsDialog::archive(){
         addFileQ.bindValue(":format", d.mimeType);
         addFileQ.bindValue(":picsize", d.picSize);
         if(addFileQ.exec()){
-            foreach(QVariant mpid, mappingParentsIds){
+            for(QVariant mpid : mappingParentsIds){
                 addMappingQ.bindValue(":mapid", mpid);
                 addMappingQ.bindValue(":md5", d.md5sum);
                 addMappingQ.exec();
@@ -310,7 +310,7 @@ bool NewPicFilesModel::setData(const QModelIndex &index, const QVariant &value,
 
 void NewPicFilesModel::setFiles(const QStringList &paths) {
     SmTreeItem *rootItem = new SmTreeItem(NumFields);
-    foreach(QString file, paths){
+    for(QString file : paths){
         QFileInfo fi(file);
         QList<QVariant> fileData;
         if(!fi.exists()){