X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclienttransfer.cpp;h=97bbbc703b1daecfe1f31936bd44971938797d11;hp=f42e14edf00fca3920600444bee0f411be79e224;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=8092ddfe050c4b5044d4f9bb07ffb1900d8c9084

diff --git a/src/client/clienttransfer.cpp b/src/client/clienttransfer.cpp
index f42e14ed..97bbbc70 100644
--- a/src/client/clienttransfer.cpp
+++ b/src/client/clienttransfer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 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  *
@@ -22,21 +22,29 @@
 
 #include "clienttransfer.h"
 
-INIT_SYNCABLE_OBJECT(ClientTransfer)
 ClientTransfer::ClientTransfer(const QUuid &uuid, QObject *parent)
     : Transfer(uuid, parent),
-    _file(0)
+    _file(nullptr)
 {
     connect(this, SIGNAL(statusChanged(Transfer::Status)), SLOT(onStatusChanged(Transfer::Status)));
 }
 
 
+quint64 ClientTransfer::transferred() const
+{
+    if (status() == Status::Completed)
+        return fileSize();
+
+    return _file ? _file->size() : 0;
+}
+
+
 void ClientTransfer::cleanUp()
 {
     if (_file) {
         _file->close();
         _file->deleteLater();
-        _file = 0;
+        _file = nullptr;
     }
 }
 
@@ -50,7 +58,7 @@ QString ClientTransfer::savePath() const
 void ClientTransfer::accept(const QString &savePath) const
 {
     _savePath = savePath;
-    PeerPtr ptr = 0;
+    PeerPtr ptr = nullptr;
     REQUEST_OTHER(requestAccepted, ARG(ptr));
     emit accepted();
 }
@@ -58,7 +66,7 @@ void ClientTransfer::accept(const QString &savePath) const
 
 void ClientTransfer::reject() const
 {
-    PeerPtr ptr = 0;
+    PeerPtr ptr = nullptr;
     REQUEST_OTHER(requestRejected, ARG(ptr));
     emit rejected();
 }
@@ -82,6 +90,8 @@ void ClientTransfer::dataReceived(PeerPtr, const QByteArray &data)
         qWarning() << Q_FUNC_INFO << "Could not write to file:" << _file->errorString();
         return;
     }
+
+    emit transferredChanged(transferred());
 }