X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclienttransfer.cpp;h=2aac8cf728d5f5290b78292dbdd9b808a983f1b1;hp=c6ba555110f6b76286e927e60cebc3dacf2da469;hb=22754c6f9444b0cd004c12984cf6eb183c2f6ae5;hpb=e3c42d072b2b8f39c8c9ea44dfc3bded87ae43b0 diff --git a/src/client/clienttransfer.cpp b/src/client/clienttransfer.cpp index c6ba5551..2aac8cf7 100644 --- a/src/client/clienttransfer.cpp +++ b/src/client/clienttransfer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 by the Quassel Project * + * Copyright (C) 2005-2015 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -27,7 +27,16 @@ ClientTransfer::ClientTransfer(const QUuid &uuid, QObject *parent) : Transfer(uuid, parent), _file(0) { - connect(this, SIGNAL(stateChanged(State)), SLOT(onStateChanged(State))); + 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; } @@ -85,14 +94,14 @@ void ClientTransfer::dataReceived(PeerPtr, const QByteArray &data) } -void ClientTransfer::onStateChanged(Transfer::State state) +void ClientTransfer::onStatusChanged(Transfer::Status status) { - switch(state) { - case Completed: + switch(status) { + case Status::Completed: if (_file) _file->close(); break; - case Failed: + case Status::Failed: if (_file) _file->remove(); break;