projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Greatly simplify TransferManager API and implementation
[quassel.git]
/
src
/
client
/
clienttransfermanager.cpp
diff --git
a/src/client/clienttransfermanager.cpp
b/src/client/clienttransfermanager.cpp
index
29342fc
..
29bdd56
100644
(file)
--- a/
src/client/clienttransfermanager.cpp
+++ b/
src/client/clienttransfermanager.cpp
@@
-23,14
+23,7
@@
#include "client.h"
#include "clienttransfer.h"
#include "client.h"
#include "clienttransfer.h"
-
INIT_SYNCABLE_OBJECT(ClientTransferManager)
INIT_SYNCABLE_OBJECT(ClientTransferManager)
-ClientTransferManager::ClientTransferManager(QObject *parent)
- : TransferManager(parent)
-{
- connect(this, SIGNAL(transferAdded(const Transfer*)), SLOT(onTransferAdded(const Transfer*)));
-}
-
void ClientTransferManager::onCoreTransferAdded(const QUuid &uuid)
{
void ClientTransferManager::onCoreTransferAdded(const QUuid &uuid)
{
@@
-39,7
+32,7
@@
void ClientTransferManager::onCoreTransferAdded(const QUuid &uuid)
return;
}
return;
}
-
ClientTransfer *
transfer = new ClientTransfer(uuid, this);
+
auto
transfer = new ClientTransfer(uuid, this);
connect(transfer, SIGNAL(initDone()), SLOT(onTransferInitDone())); // we only want to add initialized transfers
Client::signalProxy()->synchronize(transfer);
}
connect(transfer, SIGNAL(initDone()), SLOT(onTransferInitDone())); // we only want to add initialized transfers
Client::signalProxy()->synchronize(transfer);
}
@@
-51,15
+44,3
@@
void ClientTransferManager::onTransferInitDone()
Q_ASSERT(transfer);
addTransfer(transfer);
}
Q_ASSERT(transfer);
addTransfer(transfer);
}
-
-
-void ClientTransferManager::onTransferAdded(const Transfer *transfer)
-{
- const ClientTransfer *t = qobject_cast<const ClientTransfer *>(transfer);
- if (!t) {
- qWarning() << "Invalid Transfer added to ClientTransferManager!";
- return;
- }
-
- emit transferAdded(t);
-}