X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclienttransfer.cpp;h=17e9deabd8f1e726178e637210d2e1d07610ffc8;hb=d46e1e86c9869996285ac3f88970cf0e9e23e128;hp=97bbbc703b1daecfe1f31936bd44971938797d11;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;p=quassel.git diff --git a/src/client/clienttransfer.cpp b/src/client/clienttransfer.cpp index 97bbbc70..17e9deab 100644 --- a/src/client/clienttransfer.cpp +++ b/src/client/clienttransfer.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,18 +18,17 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include - #include "clienttransfer.h" -ClientTransfer::ClientTransfer(const QUuid &uuid, QObject *parent) - : Transfer(uuid, parent), - _file(nullptr) +#include + +ClientTransfer::ClientTransfer(const QUuid& uuid, QObject* parent) + : Transfer(uuid, parent) + , _file(nullptr) { - connect(this, SIGNAL(statusChanged(Transfer::Status)), SLOT(onStatusChanged(Transfer::Status))); + connect(this, &Transfer::statusChanged, this, &ClientTransfer::onStatusChanged); } - quint64 ClientTransfer::transferred() const { if (status() == Status::Completed) @@ -38,7 +37,6 @@ quint64 ClientTransfer::transferred() const return _file ? _file->size() : 0; } - void ClientTransfer::cleanUp() { if (_file) { @@ -48,14 +46,12 @@ void ClientTransfer::cleanUp() } } - QString ClientTransfer::savePath() const { return _savePath; } - -void ClientTransfer::accept(const QString &savePath) const +void ClientTransfer::accept(const QString& savePath) const { _savePath = savePath; PeerPtr ptr = nullptr; @@ -63,7 +59,6 @@ void ClientTransfer::accept(const QString &savePath) const emit accepted(); } - void ClientTransfer::reject() const { PeerPtr ptr = nullptr; @@ -71,13 +66,12 @@ void ClientTransfer::reject() const emit rejected(); } - -void ClientTransfer::dataReceived(PeerPtr, const QByteArray &data) +void ClientTransfer::dataReceived(PeerPtr, const QByteArray& data) { // TODO: proper error handling (relay to core) if (!_file) { _file = new QFile(_savePath, this); - if (!_file->open(QFile::WriteOnly|QFile::Truncate)) { + if (!_file->open(QFile::WriteOnly | QFile::Truncate)) { qWarning() << Q_FUNC_INFO << "Could not open file:" << _file->errorString(); return; } @@ -94,19 +88,18 @@ void ClientTransfer::dataReceived(PeerPtr, const QByteArray &data) emit transferredChanged(transferred()); } - void ClientTransfer::onStatusChanged(Transfer::Status status) { - switch(status) { - case Status::Completed: - if (_file) - _file->close(); - break; - case Status::Failed: - if (_file) - _file->remove(); - break; - default: - ; + switch (status) { + case Status::Completed: + if (_file) + _file->close(); + break; + case Status::Failed: + if (_file) + _file->remove(); + break; + default: + ; } }