From f459864d268cfac32d94aec1cf17069fb8a1161b Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sat, 8 Oct 2016 00:30:03 +0200
Subject: [PATCH] dcc: Clean up TransferManager a bit

---
 src/common/transfermanager.cpp |  3 +--
 src/common/transfermanager.h   | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/common/transfermanager.cpp b/src/common/transfermanager.cpp
index 13dce6e8..d3791467 100644
--- a/src/common/transfermanager.cpp
+++ b/src/common/transfermanager.cpp
@@ -22,14 +22,12 @@
 
 #include "transfer.h"
 
-
 INIT_SYNCABLE_OBJECT(TransferManager)
 
 TransferManager::TransferManager(QObject *parent)
     : SyncableObject(parent)
 {
     static auto regTypes = []() -> bool {
-        qRegisterMetaType<TransferIdList>("TransferManager::TransferIdList");
         qRegisterMetaTypeStreamOperators<TransferIdList>("TransferManager::TransferIdList");
         return true;
     }();
@@ -38,6 +36,7 @@ TransferManager::TransferManager(QObject *parent)
     renameObject("TransferManager");
 }
 
+
 Transfer *TransferManager::transfer(const QUuid &uuid) const
 {
     return _transfers.value(uuid, nullptr);
diff --git a/src/common/transfermanager.h b/src/common/transfermanager.h
index 2d09a1e7..e1b461b8 100644
--- a/src/common/transfermanager.h
+++ b/src/common/transfermanager.h
@@ -20,12 +20,12 @@
 
 #pragma once
 
-#include "syncableobject.h"
-
 #include <QHash>
 #include <QList>
 #include <QUuid>
 
+#include "syncableobject.h"
+
 class Transfer;
 
 class TransferManager : public SyncableObject
@@ -39,7 +39,7 @@ public:
     using TransferIdList = QList<QUuid>;
 
     TransferManager(QObject *parent = nullptr);
-    inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
+    const QMetaObject *syncMetaObject() const override { return &staticMetaObject; }
 
     Transfer *transfer(const QUuid &uuid) const;
     TransferIdList transferIds() const;
@@ -54,13 +54,11 @@ protected:
 
 protected slots:
     virtual void setTransferIds(const TransferIdList &transferIds) { Q_UNUSED(transferIds) };
-    virtual void onCoreTransferAdded(const QUuid &uuid) { Q_UNUSED(uuid) };
+    virtual void onCoreTransferAdded(const QUuid &transferId) { Q_UNUSED(transferId) };
 
 private:
     QHash<QUuid, Transfer *> _transfers;
 };
 
-Q_DECLARE_METATYPE(TransferManager::TransferIdList)
-
 QDataStream &operator<<(QDataStream &out, const TransferManager::TransferIdList &transferIds);
 QDataStream &operator>>(QDataStream &in, TransferManager::TransferIdList &state);
-- 
2.20.1