X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Ftransfermanager.cpp;h=3e8f52d3c9205be450de97dfec75cd766fc3214e;hp=5e5af46ebdf1b5f15a886b8fa3d4e053289f84ca;hb=0dbec2cfc937857d66a9645249f876f1e6b3f05e;hpb=695758015a80eb8c158a9ac4c0f1c0b547e70df3

diff --git a/src/common/transfermanager.cpp b/src/common/transfermanager.cpp
index 5e5af46e..3e8f52d3 100644
--- a/src/common/transfermanager.cpp
+++ b/src/common/transfermanager.cpp
@@ -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  *
@@ -22,22 +22,28 @@
 
 #include "transfer.h"
 
-
 INIT_SYNCABLE_OBJECT(TransferManager)
+
 TransferManager::TransferManager(QObject *parent)
     : SyncableObject(parent)
 {
+    static auto regTypes = []() -> bool {
+        qRegisterMetaTypeStreamOperators<TransferIdList>("TransferManager::TransferIdList");
+        return true;
+    }();
+    Q_UNUSED(regTypes);
 
+    renameObject("TransferManager");
 }
 
 
-Transfer *TransferManager::transfer_(const QUuid &uuid) const
+Transfer *TransferManager::transfer(const QUuid &uuid) const
 {
-    return _transfers.value(uuid, 0);
+    return _transfers.value(uuid, nullptr);
 }
 
 
-QList<QUuid> TransferManager::transferIds() const
+TransferManager::TransferIdList TransferManager::transferIds() const
 {
     return _transfers.keys();
 }
@@ -55,5 +61,42 @@ void TransferManager::addTransfer(Transfer *transfer)
     _transfers[uuid] = transfer;
 
     SYNC_OTHER(onCoreTransferAdded, ARG(uuid));
-    emit transferAdded(transfer);
+    emit transferAdded(uuid);
+}
+
+
+void TransferManager::removeTransfer(const QUuid &uuid)
+{
+    if (!_transfers.contains(uuid)) {
+        qWarning() << "Can not find transfer" << uuid << "to remove!";
+        return;
+    }
+    emit transferRemoved(uuid);
+    auto transfer = _transfers.take(uuid);
+    transfer->deleteLater();
+}
+
+
+QDataStream &operator<<(QDataStream &out, const TransferManager::TransferIdList &transferIds)
+{
+    out << static_cast<quint32>(transferIds.size());
+    for (auto &&id : transferIds) {
+        out << id;
+    }
+    return out;
+}
+
+
+QDataStream &operator>>(QDataStream &in, TransferManager::TransferIdList &transferIds)
+{
+    quint32 count;
+    in >> count;
+    transferIds.clear();
+    transferIds.reserve(count);
+    for (quint32 i = 0; i < count; ++i) {
+        QUuid id;
+        in >> id;
+        transferIds << id;
+    }
+    return in;
 }