From 2c62efdfd7e99e7af18704292acc2a0bcdcbbb95 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Tue, 8 Mar 2016 00:18:39 +0100 Subject: [PATCH] Transfers also should notify on changes to transferred() Adds the missing signal, and emits it appropriately. --- src/client/clienttransfer.cpp | 2 ++ src/common/transfer.h | 3 ++- src/core/coretransfer.cpp | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/client/clienttransfer.cpp b/src/client/clienttransfer.cpp index 2aac8cf7..fe678818 100644 --- a/src/client/clienttransfer.cpp +++ b/src/client/clienttransfer.cpp @@ -91,6 +91,8 @@ void ClientTransfer::dataReceived(PeerPtr, const QByteArray &data) qWarning() << Q_FUNC_INFO << "Could not write to file:" << _file->errorString(); return; } + + emit transferredChanged(transferred()); } diff --git a/src/common/transfer.h b/src/common/transfer.h index 48deb5bf..5091b3f1 100644 --- a/src/common/transfer.h +++ b/src/common/transfer.h @@ -86,12 +86,13 @@ public slots: virtual void requestRejected(PeerPtr peer) { Q_UNUSED(peer); } signals: - void statusChanged (Transfer::Status state); + void statusChanged(Transfer::Status state); void directionChanged(Transfer::Direction direction); void addressChanged(const QHostAddress &address); void portChanged(quint16 port); void fileNameChanged(const QString &fileName); void fileSizeChanged(quint64 fileSize); + void transferredChanged(quint64 transferred); void nickChanged(const QString &nick); void error(const QString &errorString); diff --git a/src/core/coretransfer.cpp b/src/core/coretransfer.cpp index 0d454ae3..ea07b374 100644 --- a/src/core/coretransfer.cpp +++ b/src/core/coretransfer.cpp @@ -148,6 +148,7 @@ void CoreTransfer::onDataReceived() while (_socket->bytesAvailable()) { QByteArray data = _socket->read(chunkSize); _pos += data.size(); + emit transferredChanged(transferred()); if (!relayData(data, true)) return; -- 2.20.1