X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoretransfer.cpp;h=209a800fcd3d23a692399e771ab97711ec28c44a;hp=0d454ae3850bf10107c1b1a40a3029d01c2f8d2b;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=22754c6f9444b0cd004c12984cf6eb183c2f6ae5 diff --git a/src/core/coretransfer.cpp b/src/core/coretransfer.cpp index 0d454ae3..209a800f 100644 --- a/src/core/coretransfer.cpp +++ b/src/core/coretransfer.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 * @@ -27,11 +27,9 @@ const qint64 chunkSize = 16 * 1024; -INIT_SYNCABLE_OBJECT(CoreTransfer) - CoreTransfer::CoreTransfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent) : Transfer(direction, nick, fileName, address, port, fileSize, parent), - _socket(0), + _socket(nullptr), _pos(0), _reading(false) { @@ -50,7 +48,7 @@ void CoreTransfer::cleanUp() if (_socket) { _socket->close(); _socket->deleteLater(); - _socket = 0; + _socket = nullptr; } _buffer.clear(); @@ -148,6 +146,7 @@ void CoreTransfer::onDataReceived() while (_socket->bytesAvailable()) { QByteArray data = _socket->read(chunkSize); _pos += data.size(); + emit transferredChanged(transferred()); if (!relayData(data, true)) return;