Convert TorrentDisplay

to type safe connect and weed out Q_FOREACH.

1 files changed, 6 insertions, 6 deletions

diff --git a/torrentdisplay.cpp b/torrentdisplay.cpp
index 58df338..8f54b81 100644
--- a/torrentdisplay.cpp
+++ b/torrentdisplay.cpp
@@ -72,7 +72,7 @@ TorrentDisplay::TorrentDisplay(QWidget *parent, Qt::WindowFlags f) : QDialog(par
     buttonLayout->addStretch();
     buttonLayout->addWidget(closeBtn);
     buttonLayout->addStretch();
-    connect(closeBtn, SIGNAL(clicked()), this, SLOT(hide()));
+    connect(closeBtn, &QPushButton::clicked, this, &TorrentDisplay::hide);
 
     //dialog layout
     QVBoxLayout *mainLayout = new QVBoxLayout;
@@ -86,7 +86,7 @@ TorrentDisplay::TorrentDisplay(QWidget *parent, Qt::WindowFlags f) : QDialog(par
     //actions
     QAction *copyFnToClip = new QAction(QIcon(":/edit-copy.png"), tr("Filename to Clip"), this);
     copyFnToClip->setShortcut(tr("CTRL+C"));
-    connect(copyFnToClip, SIGNAL(triggered()), this, SLOT(copyToClipboard()));
+    connect(copyFnToClip, &QAction::triggered, this, &TorrentDisplay::copyToClipboard);
     addActions(QList<QAction*>() << copyFnToClip);
 }
 
@@ -99,7 +99,7 @@ void TorrentDisplay::setData(const QList<QVariant> data, const QString &filename
     mAnnounceModel->clear();
     mAnnounceModel->setHorizontalHeaderLabels(QStringList() << tr("Tracker"));
 
-    foreach(QVariant cur, data){
+    for(QVariant 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();
-                    foreach(QVariant l2, l1){
+                    for(QVariant l2 : l1){
                         QVariantList l3 = l2.toList();
-                        foreach(QVariant ann, l3){
+                        for(QVariant 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();
-    foreach(QVariant entry, fileList){
+    for(QVariant entry : fileList){
         QVariantHash e = entry.toHash();
         QVariantList path = e.value("path").toList();
         QStandardItem *i1 = new QStandardItem(path.last().toString());