X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Ftransfermodel.cpp;fp=src%2Fclient%2Ftransfermodel.cpp;h=a75b8c508dbf4d0a2b035004d66dc505abdb2a89;hp=affd487152d51f49b55bd88d52af8f051572a0b6;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=714b39660fe19e7f092880019429c8da76ee2bd5 diff --git a/src/client/transfermodel.cpp b/src/client/transfermodel.cpp index affd4871..a75b8c50 100644 --- a/src/client/transfermodel.cpp +++ b/src/client/transfermodel.cpp @@ -114,8 +114,8 @@ 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); } @@ -132,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);