projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #93 from mamarley/quitonfaileddbconn
[quassel.git]
/
src
/
core
/
coretransfermanager.cpp
diff --git
a/src/core/coretransfermanager.cpp
b/src/core/coretransfermanager.cpp
index
a11927a
..
c8f79dd
100644
(file)
--- a/
src/core/coretransfermanager.cpp
+++ b/
src/core/coretransfermanager.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
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 *
@@
-20,8
+20,7
@@
#include "coretransfermanager.h"
#include "coretransfermanager.h"
-#include "transfer.h"
-
+#include "coretransfer.h"
INIT_SYNCABLE_OBJECT(CoreTransferManager)
CoreTransferManager::CoreTransferManager(QObject *parent)
INIT_SYNCABLE_OBJECT(CoreTransferManager)
CoreTransferManager::CoreTransferManager(QObject *parent)
@@
-31,20
+30,26
@@
CoreTransferManager::CoreTransferManager(QObject *parent)
}
}
-void CoreTransferManager::onTransferAdded(const Transfer *transfer)
+CoreTransfer *CoreTransferManager::transfer(const QUuid &uuid) const
{
{
- connect(transfer, SIGNAL(accepted(PeerPtr)), SLOT(onTransferAccepted(PeerPtr)));
- connect(transfer, SIGNAL(rejected(PeerPtr)), SLOT(onTransferRejected(PeerPtr)));
+ return qobject_cast<CoreTransfer *>(transfer_(uuid));
}
}
-void CoreTransferManager::
onTransferAccepted(PeerPtr pe
er)
+void CoreTransferManager::
addTransfer(CoreTransfer *transf
er)
{
{
-
+ TransferManager::addTransfer(transfer);
}
}
-void CoreTransferManager::onTransfer
Rejected(PeerPtr pe
er)
+void CoreTransferManager::onTransfer
Added(const Transfer *transf
er)
{
{
-
+ // for core-side use, publishing a non-const pointer is ok
+ CoreTransfer *t = const_cast<CoreTransfer *>(qobject_cast<const CoreTransfer *>(transfer));
+ if (!t) {
+ qWarning() << "Invalid Transfer added to CoreTransferManager!";
+ return;
+ }
+
+ emit transferAdded(t);
}
}