X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclienttransfer.cpp;h=97bbbc703b1daecfe1f31936bd44971938797d11;hp=2aac8cf728d5f5290b78292dbdd9b808a983f1b1;hb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;hpb=22754c6f9444b0cd004c12984cf6eb183c2f6ae5 diff --git a/src/client/clienttransfer.cpp b/src/client/clienttransfer.cpp index 2aac8cf7..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,10 +22,9 @@ #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))); } @@ -45,7 +44,7 @@ void ClientTransfer::cleanUp() if (_file) { _file->close(); _file->deleteLater(); - _file = 0; + _file = nullptr; } } @@ -59,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(); } @@ -67,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(); } @@ -91,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()); }