dcc: Clean up TransferManager a bit

diff --git a/src/common/transfermanager.cpp b/src/common/transfermanager.cpp
index 13dce6e..d379146 100644 (file)
--- a/src/common/transfermanager.cpp
+++ b/src/common/transfermanager.cpp
@@ -22,14 +22,12 @@
 
 #include "transfer.h"
 
 
 #include "transfer.h"
 

-

 INIT_SYNCABLE_OBJECT(TransferManager)
 
 TransferManager::TransferManager(QObject *parent)
     : SyncableObject(parent)
 {
     static auto regTypes = []() -> bool {
 INIT_SYNCABLE_OBJECT(TransferManager)
 
 TransferManager::TransferManager(QObject *parent)
     : SyncableObject(parent)
 {
     static auto regTypes = []() -> bool {

-        qRegisterMetaType<TransferIdList>("TransferManager::TransferIdList");

         qRegisterMetaTypeStreamOperators<TransferIdList>("TransferManager::TransferIdList");
         return true;
     }();
         qRegisterMetaTypeStreamOperators<TransferIdList>("TransferManager::TransferIdList");
         return true;
     }();


@@ -38,6 +36,7 @@ TransferManager::TransferManager(QObject *parent)
     renameObject("TransferManager");
 }
 
     renameObject("TransferManager");
 }
 

+

 Transfer *TransferManager::transfer(const QUuid &uuid) const
 {
     return _transfers.value(uuid, nullptr);
 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 2d09a1e..e1b461b 100644 (file)
--- a/src/common/transfermanager.h
+++ b/src/common/transfermanager.h
@@ -20,12 +20,12 @@
 
 #pragma once
 
 
 #pragma once
 

-#include "syncableobject.h"
-

 #include <QHash>
 #include <QList>
 #include <QUuid>
 
 #include <QHash>
 #include <QList>
 #include <QUuid>
 

+#include "syncableobject.h"
+

 class Transfer;
 
 class TransferManager : public SyncableObject
 class Transfer;
 
 class TransferManager : public SyncableObject


@@ -39,7 +39,7 @@ public:
     using TransferIdList = QList<QUuid>;
 
     TransferManager(QObject *parent = nullptr);
     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;
 
     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) };
 
 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;
 };
 
 
 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);
 QDataStream &operator<<(QDataStream &out, const TransferManager::TransferIdList &transferIds);
 QDataStream &operator>>(QDataStream &in, TransferManager::TransferIdList &state);