X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftransfermodel.cpp;h=a75b8c508dbf4d0a2b035004d66dc505abdb2a89;hp=fdacd186978b3d2c808b25252c559ef3df08e4ee;hb=900cce213a6ed000b7131a05a0dec7d04b35b023;hpb=123fc368f8705fa7799c04ee84af85999a7ebde3

diff --git a/src/client/transfermodel.cpp b/src/client/transfermodel.cpp
index fdacd186..a75b8c50 100644
--- a/src/client/transfermodel.cpp
+++ b/src/client/transfermodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -106,7 +106,7 @@ QVariant TransferModel::data(const QModelIndex& index, int role) const
 void TransferModel::setManager(const TransferManager *manager)
 {
     if (_manager) {
-        disconnect(_manager, 0, this, 0);
+        disconnect(_manager, nullptr, this, nullptr);
         beginResetModel();
         _transferIds.clear();
         endResetModel();
@@ -114,8 +114,11 @@ void TransferModel::setManager(const TransferManager *manager)
 
     _manager = manager;
     if (_manager) {
-        connect(manager, SIGNAL(transferAdded(QUuid)), SLOT(onTransferAdded(QUuid)));
-        connect(manager, SIGNAL(transferRemoved(QUuid)), SLOT(onTransferRemoved(QUuid)));
+        connect(manager, &TransferManager::transferAdded, this, &TransferModel::onTransferAdded);
+        connect(manager, &TransferManager::transferRemoved, this, &TransferModel::onTransferRemoved);
+        for (auto &&transferId : _manager->transferIds()) {
+            onTransferAdded(transferId);
+        }
     }
 }
 
@@ -129,14 +132,14 @@ void TransferModel::onTransferAdded(const QUuid &transferId)
     }
 
     // TODO Qt5: use new connection syntax to make things much less complicated
-    connect(transfer, SIGNAL(statusChanged(Transfer::Status)), SLOT(onTransferDataChanged()));
-    connect(transfer, SIGNAL(directionChanged(Transfer::Direction)), SLOT(onTransferDataChanged()));
-    connect(transfer, SIGNAL(addressChanged(QHostAddress)), SLOT(onTransferDataChanged()));
-    connect(transfer, SIGNAL(portChanged(quint16)), SLOT(onTransferDataChanged()));
-    connect(transfer, SIGNAL(fileNameChanged(QString)), SLOT(onTransferDataChanged()));
-    connect(transfer, SIGNAL(fileSizeChanged(quint64)), SLOT(onTransferDataChanged()));
-    connect(transfer, SIGNAL(transferredChanged(quint64)), SLOT(onTransferDataChanged()));
-    connect(transfer, SIGNAL(nickChanged(QString)), SLOT(onTransferDataChanged()));
+    connect(transfer, &Transfer::statusChanged, this, &TransferModel::onTransferDataChanged);
+    connect(transfer, &Transfer::directionChanged, this, &TransferModel::onTransferDataChanged);
+    connect(transfer, &Transfer::addressChanged, this, &TransferModel::onTransferDataChanged);
+    connect(transfer, &Transfer::portChanged, this, &TransferModel::onTransferDataChanged);
+    connect(transfer, &Transfer::fileNameChanged, this, &TransferModel::onTransferDataChanged);
+    connect(transfer, &Transfer::fileSizeChanged, this, &TransferModel::onTransferDataChanged);
+    connect(transfer, &Transfer::transferredChanged, this, &TransferModel::onTransferDataChanged);
+    connect(transfer, &Transfer::nickChanged, this, &TransferModel::onTransferDataChanged);
 
     beginInsertRows({}, rowCount(), rowCount());
     _transferIds.append(transferId);
@@ -149,7 +152,7 @@ void TransferModel::onTransferRemoved(const QUuid &transferId)
     // Check if the transfer object still exists, which means we still should disconnect
     auto transfer = _manager->transfer(transferId);
     if (transfer)
-        disconnect(transfer, 0, this, 0);
+        disconnect(transfer, nullptr, this, nullptr);
 
     for (auto row = 0; row < _transferIds.size(); ++row) {
         if (_transferIds[row] == transferId) {