X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftransfermanager.h;h=494d338e138a767ce563487d86ab207c56298d7d;hb=ab7ef4d24f62b5848b628482b7762ebfc0b53e1a;hp=2d09a1e7633409e58bbaf8c24cd687296898a102;hpb=8443ab1e0a812d76d5efa816d5bd3d476d67ab2d;p=quassel.git diff --git a/src/common/transfermanager.h b/src/common/transfermanager.h index 2d09a1e7..494d338e 100644 --- a/src/common/transfermanager.h +++ b/src/common/transfermanager.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 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 * @@ -20,12 +20,12 @@ #pragma once -#include "syncableobject.h" - #include #include #include +#include "syncableobject.h" + class Transfer; class TransferManager : public SyncableObject @@ -39,7 +39,7 @@ public: using TransferIdList = QList; 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 _transfers; }; -Q_DECLARE_METATYPE(TransferManager::TransferIdList) - QDataStream &operator<<(QDataStream &out, const TransferManager::TransferIdList &transferIds); QDataStream &operator>>(QDataStream &in, TransferManager::TransferIdList &state);