Also fixes more inconsistent/missing uses of 'override'.
}
+quint64 ClientTransfer::transferred() const
+{
+ if (status() == Status::Completed)
+ return fileSize();
+
+ return _file ? _file->size() : 0;
+}
+
+
void ClientTransfer::cleanUp()
{
if (_file) {
QString savePath() const;
+ quint64 transferred() const override;
+
public slots:
// called on the client side
void accept(const QString &savePath) const override;
Transfer(const QUuid &uuid, QObject *parent = 0); // for creating a syncable object client-side
Transfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 size = 0, QObject *parent = 0);
- inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
+ inline const QMetaObject *syncMetaObject() const override { return &staticMetaObject; }
QUuid uuid() const;
Status status() const;
quint64 fileSize() const;
QString nick() const;
+ virtual quint64 transferred() const = 0;
+
public slots:
// called on the client side
virtual void accept(const QString &savePath) const { Q_UNUSED(savePath); }
}
+quint64 CoreTransfer::transferred() const
+{
+ return _pos;
+}
+
+
void CoreTransfer::cleanUp()
{
if (_socket) {
public:
CoreTransfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 size = 0, QObject *parent = 0);
+ 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();
private:
void setupConnectionForReceive();
bool relayData(const QByteArray &data, bool requireChunkSize);
- virtual void cleanUp();
+ void cleanUp() override;
QPointer<Peer> _peer;
QTcpSocket *_socket;