Clean up archiveview.cpp

* Use type-safe connect
* remove Q_FOREACH
* remove some unused #includes

2 files changed, 24 insertions, 29 deletions

diff --git a/archiveview.cpp b/archiveview.cpp
index 2773512..8463201 100644
--- a/archiveview.cpp
+++ b/archiveview.cpp
@@ -16,7 +16,6 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QSettings>
-#include <QStandardPaths>
 #include <QSplitter>
 #include <QVBoxLayout>
 #include <QHeaderView>
@@ -27,12 +26,10 @@
 #include <QStandardItemModel>
 #include <QFormLayout>
 #include <QToolBar>
-#include <QMouseEvent>
 #include <QDrag>
 #include <QMimeData>
 #include <QDropEvent>
 #include <QApplication>
-#include <QDataStream>
 
 #include "archiveview.h"
 #include "archivecontroller.h"
@@ -46,8 +43,8 @@
 ArchiveView::ArchiveView(QWidget *parent) : QWidget(parent) {
     QSettings s;
     mArchiveModel = static_cast<ArchiveModel*>(SmGlobals::instance()->model("ArchiveModel"));
-    connect(mArchiveModel, SIGNAL(needRefresh()), this, SLOT(refreshArchive()));
-    connect(mArchiveModel, SIGNAL(databaseError(QString)), this, SLOT(showDatabaseError(QString)));
+    connect(mArchiveModel, &ArchiveModel::needRefresh, this, &ArchiveView::refreshArchive);
+    connect(mArchiveModel, &ArchiveModel::databaseError, this, &ArchiveView::showDatabaseError);
 
     mProxy = new ArchiveProxy;
     mProxy->setSourceModel(mArchiveModel);
@@ -63,8 +60,8 @@ ArchiveView::ArchiveView(QWidget *parent) : QWidget(parent) {
     mTree->resizeColumnToContents(ArchiveModel::Name);
     mTree->setSortingEnabled(true);
     mTree->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    connect(mTree, SIGNAL(expanded(QModelIndex)), this, SLOT(expandItem(QModelIndex)));
-    connect(mTree, SIGNAL(collapsed(QModelIndex)), this, SLOT(collapseItem(QModelIndex)));
+    connect(mTree, &ArchiveTree::expanded, this, &ArchiveView::expandItem);
+    connect(mTree, &ArchiveTree::collapsed, this, &ArchiveView::collapseItem);
     mTree->sortByColumn(0, Qt::AscendingOrder);
 
     QString sortOrderName = s.value("archivemodel/sortorder", "Series Name").toString();
@@ -74,18 +71,18 @@ ArchiveView::ArchiveView(QWidget *parent) : QWidget(parent) {
     // this is _not_ redundant! when sortOrderName is the first
     // item in the list, nothing will happen otherwise!
     mArchiveModel->setOrder(sortOrderName);
-    connect(mSortOrder, SIGNAL(currentIndexChanged(QString)), mArchiveModel, SLOT(setOrder(QString)));
-    connect(mArchiveModel, SIGNAL(modelReset()), this, SLOT(doSelection()));
+    connect(mSortOrder, QOverload<const QString &>::of(&QComboBox::currentIndexChanged), mArchiveModel, QOverload<const QString &>::of(&ArchiveModel::setOrder));
+    connect(mArchiveModel, &ArchiveModel::modelReset, this, &ArchiveView::doSelection);
 
     QLabel *l1 = new QLabel(tr("Filter"));
     mFilter = new QLineEdit;
     QString savedFilter = s.value("archivemodel/filter", QString()).toString();
-    connect(mFilter, SIGNAL(returnPressed()), this, SLOT(setFilter()));
+    connect(mFilter, &QLineEdit::returnPressed, this, &ArchiveView::setFilter);
     QPushButton *filter = new QPushButton(tr("Filter"));
-    connect(filter, SIGNAL(clicked()), this, SLOT(setFilter()));
+    connect(filter, &QPushButton::clicked, this, &ArchiveView::setFilter);
     QPushButton *clear = new QPushButton(tr("Clear"));
     mFilter->setText(savedFilter);
-    connect(clear, SIGNAL(clicked()), this, SLOT(clearFilter()));
+    connect(clear, &QPushButton::clicked, this, &ArchiveView::clearFilter);
     mProxy->setFilter(savedFilter, currentSortOrder());
     QHBoxLayout *filterLayout = new QHBoxLayout;
     filterLayout->addWidget(l1);
@@ -222,10 +219,10 @@ void ArchiveView::refreshArchive(){
 
 void ArchiveView::doSelection(){
     QVariantList list = mExpandedItems.value(currentSortOrder());
-    foreach(QVariant p, list){
+    for(const QVariant &p : list){
         QStringList path = p.toStringList();
         QModelIndexList expand = mArchiveModel->pathToIndex(path);
-        foreach(QModelIndex idx, expand){
+        for(const QModelIndex &idx : expand){
             mTree->setExpanded(mProxy->mapFromSource(idx), true);
         }
     }
@@ -429,7 +426,7 @@ void ArchiveTree::deleteFromTree(){
         QStringList files = fm->filesForSeriespart(seriesPartId);
         if(!files.isEmpty()){
             QString msg = tr("<b>This action will permanently delete the following files:</b><ul>");
-            foreach(QString f, files){
+            for(const QString &f : files){
                 QString fli = QString("<li>%1</li>").arg(f);
                 msg.append(fli);
             }
@@ -543,7 +540,7 @@ void ArchiveFiles::deleteFromFiles(){
     QModelIndexList selected = selectionModel()->selectedRows();
     QString msg = tr("<b>This action will permanently delete the following files:</b><ul>");
     QList<int> fileIds;
-    foreach(QModelIndex idx, selected){
+    for(const QModelIndex &idx : selected){
         QString a = QString("<li>%1</li>").arg(idx.data(ArchiveFilesModel::FullPathRole).toString());
         msg.append(a);
         fileIds << idx.data(ArchiveFilesModel::FileIdRole).toInt();
@@ -582,7 +579,7 @@ void ArchiveFiles::mouseMoveEvent(QMouseEvent *e){
     QByteArray dataBuf;
     QDataStream stream(&dataBuf, QIODevice::WriteOnly);
     stream << sel.size();
-    foreach(QModelIndex i, sel){
+    for(const QModelIndex &i : sel){
         files.append("<li>");
         files.append(i.data(ArchiveFilesModel::FilenameRole).toString());
         stream << i.data(ArchiveFilesModel::Md5SumRole);
@@ -673,15 +670,15 @@ MappingEditorWidget::MappingEditorWidget(const QString &caption, bool showClearB
     QHBoxLayout *editButtonLayout = new QHBoxLayout;
     editButtonLayout->addStretch();
     mClear = new QPushButton(tr("Clear"));
-    connect(mClear, SIGNAL(clicked()), this, SLOT(clear()));
+    connect(mClear, &QPushButton::clicked, this, &MappingEditorWidget::clear);
     if(showClearButton){
         editButtonLayout->addWidget(mClear);
     }
     mRemove = new QPushButton(tr("&Remove"));
-    connect(mRemove, SIGNAL(clicked()), this, SLOT(removeItem()));
+    connect(mRemove, &QPushButton::clicked, this, &MappingEditorWidget::removeItem);
     editButtonLayout->addWidget(mRemove);
     mAdd = new QPushButton(tr("&Add"));
-    connect(mAdd, SIGNAL(clicked()), this, SLOT(addItem()));
+    connect(mAdd, &QPushButton::clicked, this, &MappingEditorWidget::addItem);
     editButtonLayout->addWidget(mAdd);
 
     // main layout
@@ -697,7 +694,7 @@ void MappingEditorWidget::fillCompleter(const QStringList &completions){
 }
 
 void MappingEditorWidget::setCurrentItems(const QStringList &items){
-    foreach(QString i, items){
+    for(const QString &i : items){
         QStandardItem *item = new QStandardItem(i);
         item->setIcon(mDecorationIcon);
         mModel->appendRow(item);
@@ -754,10 +751,10 @@ MappingEditor::MappingEditor(const QString &caption, QWidget *parent, Qt::Window
     QHBoxLayout *buttonLayout = new QHBoxLayout;
     buttonLayout->addStretch();
     mCancel = new QPushButton(tr("Cancel"));
-    connect(mCancel, SIGNAL(clicked()), this, SLOT(reject()));
+    connect(mCancel, &QPushButton::clicked, this, &MappingEditor::reject);
     buttonLayout->addWidget(mCancel);
     mAccept = new QPushButton(tr("Accept"));
-    connect(mAccept, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(mAccept, &QPushButton::clicked, this, &MappingEditor::accept);
     buttonLayout->addWidget(mAccept);
 
     // dialog layout
@@ -867,10 +864,10 @@ MetadataEditor::MetadataEditor(QWidget *parent, Qt::WindowFlags f) : QDialog(par
     QHBoxLayout *buttonLayout = new QHBoxLayout;
     buttonLayout->addStretch();
     mCancel = new QPushButton(tr("Cancel"));
-    connect(mCancel, SIGNAL(clicked()), this, SLOT(reject()));
+    connect(mCancel, &QPushButton::clicked, this, &MetadataEditor::reject);
     buttonLayout->addWidget(mCancel);
     mAccept = new QPushButton(tr("Accept"));
-    connect(mAccept, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(mAccept, &QPushButton::clicked, this, &MetadataEditor::accept);
     buttonLayout->addWidget(mAccept);
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
@@ -900,9 +897,9 @@ PartEditor::PartEditor(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f){
     QHBoxLayout *buttonLayout = new QHBoxLayout;
     buttonLayout->addStretch();
     mCancel = new QPushButton(tr("Cancel"));
-    connect(mCancel, SIGNAL(clicked()), this, SLOT(reject()));
+    connect(mCancel, &QPushButton::clicked, this, &PartEditor::reject);
     mAccept = new QPushButton(tr("Accept"));
-    connect(mAccept, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(mAccept, &QPushButton::clicked, this, &PartEditor::accept);
     buttonLayout->addWidget(mCancel);
     buttonLayout->addWidget(mAccept);
 
diff --git a/archiveview.h b/archiveview.h
index 7a288db..867b482 100644
--- a/archiveview.h
+++ b/archiveview.h
@@ -9,10 +9,8 @@
 #define ARCHIVEVIEW_H
 
 #include <QDialog>
-#include <QRegExp>
 #include <QSortFilterProxyModel>
 #include <QWidget>
-#include <QStyledItemDelegate>
 #include <QDate>
 
 #include "archivemodel.h"