projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Remove old-style slot usage in NetworkModelController
[quassel.git]
/
src
/
client
/
clienttransfer.cpp
diff --git
a/src/client/clienttransfer.cpp
b/src/client/clienttransfer.cpp
index
8398097
..
ca91e5c
100644
(file)
--- a/
src/client/clienttransfer.cpp
+++ b/
src/client/clienttransfer.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
8
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-22,12
+22,20
@@
#include "clienttransfer.h"
#include "clienttransfer.h"
-INIT_SYNCABLE_OBJECT(ClientTransfer)
ClientTransfer::ClientTransfer(const QUuid &uuid, QObject *parent)
: Transfer(uuid, parent),
ClientTransfer::ClientTransfer(const QUuid &uuid, QObject *parent)
: Transfer(uuid, parent),
- _file(
0
)
+ _file(
nullptr
)
{
{
- connect(this, SIGNAL(stateChanged(State)), SLOT(onStateChanged(State)));
+ connect(this, &Transfer::statusChanged, this, &ClientTransfer::onStatusChanged);
+}
+
+
+quint64 ClientTransfer::transferred() const
+{
+ if (status() == Status::Completed)
+ return fileSize();
+
+ return _file ? _file->size() : 0;
}
}
@@
-36,7
+44,7
@@
void ClientTransfer::cleanUp()
if (_file) {
_file->close();
_file->deleteLater();
if (_file) {
_file->close();
_file->deleteLater();
- _file =
0
;
+ _file =
nullptr
;
}
}
}
}
@@
-50,7
+58,7
@@
QString ClientTransfer::savePath() const
void ClientTransfer::accept(const QString &savePath) const
{
_savePath = savePath;
void ClientTransfer::accept(const QString &savePath) const
{
_savePath = savePath;
- PeerPtr ptr =
0
;
+ PeerPtr ptr =
nullptr
;
REQUEST_OTHER(requestAccepted, ARG(ptr));
emit accepted();
}
REQUEST_OTHER(requestAccepted, ARG(ptr));
emit accepted();
}
@@
-58,7
+66,7
@@
void ClientTransfer::accept(const QString &savePath) const
void ClientTransfer::reject() const
{
void ClientTransfer::reject() const
{
- PeerPtr ptr =
0
;
+ PeerPtr ptr =
nullptr
;
REQUEST_OTHER(requestRejected, ARG(ptr));
emit rejected();
}
REQUEST_OTHER(requestRejected, ARG(ptr));
emit rejected();
}
@@
-82,17
+90,19
@@
void ClientTransfer::dataReceived(PeerPtr, const QByteArray &data)
qWarning() << Q_FUNC_INFO << "Could not write to file:" << _file->errorString();
return;
}
qWarning() << Q_FUNC_INFO << "Could not write to file:" << _file->errorString();
return;
}
+
+ emit transferredChanged(transferred());
}
}
-void ClientTransfer::onStat
eChanged(Transfer::State state
)
+void ClientTransfer::onStat
usChanged(Transfer::Status status
)
{
{
- switch(stat
e
) {
- case Completed:
+ switch(stat
us
) {
+ case
Status::
Completed:
if (_file)
_file->close();
break;
if (_file)
_file->close();
break;
- case Failed:
+ case
Status::
Failed:
if (_file)
_file->remove();
break;
if (_file)
_file->remove();
break;