X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoretransfer.h;h=02c21c8804827cfb2ebac139fe2193d85d0a84ec;hp=3244efdfd23d2ccf477d1bd47b2bc27f56f742b9;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=695758015a80eb8c158a9ac4c0f1c0b547e70df3 diff --git a/src/core/coretransfer.h b/src/core/coretransfer.h index 3244efdf..02c21c88 100644 --- a/src/core/coretransfer.h +++ b/src/core/coretransfer.h @@ -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 * @@ -18,8 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef CORETRANSFER_H -#define CORETRANSFER_H +#pragma once #include @@ -31,17 +30,18 @@ class QTcpSocket; class CoreTransfer : public Transfer { Q_OBJECT - SYNCABLE_OBJECT public: - CoreTransfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 size = 0, QObject *parent = 0); + CoreTransfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 size = 0, QObject *parent = nullptr); + + quint64 transferred() const override; public slots: void start(); // called through sync calls - void requestAccepted(PeerPtr peer); - void requestRejected(PeerPtr peer); + void requestAccepted(PeerPtr peer) override; + void requestRejected(PeerPtr peer) override; private slots: void startReceiving(); @@ -52,7 +52,7 @@ private slots: private: void setupConnectionForReceive(); bool relayData(const QByteArray &data, bool requireChunkSize); - virtual void cleanUp(); + void cleanUp() override; QPointer _peer; QTcpSocket *_socket; @@ -60,5 +60,3 @@ private: QByteArray _buffer; bool _reading; }; - -#endif