projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Allow skipping negotiation of IRCv3 caps
[quassel.git]
/
src
/
common
/
transfermanager.cpp
diff --git
a/src/common/transfermanager.cpp
b/src/common/transfermanager.cpp
index
3e8f52d
..
23273d6
100644
(file)
--- a/
src/common/transfermanager.cpp
+++ b/
src/common/transfermanager.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
by the Quassel Project *
+ * Copyright (C) 2005-20
20
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 *
@@
-22,34
+22,27
@@
#include "transfer.h"
#include "transfer.h"
-INIT_SYNCABLE_OBJECT(TransferManager)
-
-TransferManager::TransferManager(QObject *parent)
- : SyncableObject(parent)
+TransferManager::TransferManager(QObject* parent)
+ : SyncableObject("TransferManager", parent)
{
static auto regTypes = []() -> bool {
qRegisterMetaTypeStreamOperators<TransferIdList>("TransferManager::TransferIdList");
return true;
}();
Q_UNUSED(regTypes);
{
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, nullptr);
}
{
return _transfers.value(uuid, nullptr);
}
-
TransferManager::TransferIdList TransferManager::transferIds() const
{
return _transfers.keys();
}
TransferManager::TransferIdList TransferManager::transferIds() const
{
return _transfers.keys();
}
-
-void TransferManager::addTransfer(Transfer *transfer)
+void TransferManager::addTransfer(Transfer* transfer)
{
QUuid uuid = transfer->uuid();
if (_transfers.contains(uuid)) {
{
QUuid uuid = transfer->uuid();
if (_transfers.contains(uuid)) {
@@
-64,8
+57,7
@@
void TransferManager::addTransfer(Transfer *transfer)
emit transferAdded(uuid);
}
emit transferAdded(uuid);
}
-
-void TransferManager::removeTransfer(const QUuid &uuid)
+void TransferManager::removeTransfer(const QUuid& uuid)
{
if (!_transfers.contains(uuid)) {
qWarning() << "Can not find transfer" << uuid << "to remove!";
{
if (!_transfers.contains(uuid)) {
qWarning() << "Can not find transfer" << uuid << "to remove!";
@@
-76,18
+68,16
@@
void TransferManager::removeTransfer(const QUuid &uuid)
transfer->deleteLater();
}
transfer->deleteLater();
}
-
-QDataStream &operator<<(QDataStream &out, const TransferManager::TransferIdList &transferIds)
+QDataStream& operator<<(QDataStream& out, const TransferManager::TransferIdList& transferIds)
{
out << static_cast<quint32>(transferIds.size());
{
out << static_cast<quint32>(transferIds.size());
- for (auto
&&
id : transferIds) {
+ for (auto
&&
id : transferIds) {
out << id;
}
return out;
}
out << id;
}
return out;
}
-
-QDataStream &operator>>(QDataStream &in, TransferManager::TransferIdList &transferIds)
+QDataStream& operator>>(QDataStream& in, TransferManager::TransferIdList& transferIds)
{
quint32 count;
in >> count;
{
quint32 count;
in >> count;