From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 28 Feb 2016 21:11:05 +0000 (+0100)
Subject: Remove weird convenience accessors
X-Git-Tag: travis-deploy-test~512
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=812db6d90040c30fb27f73a1d3e5e304f1ddbf91

Remove weird convenience accessors

No clue why I thought this would be a good idea...
---

diff --git a/src/client/clienttransfermanager.cpp b/src/client/clienttransfermanager.cpp
index ec5c49fa..29342fc3 100644
--- a/src/client/clienttransfermanager.cpp
+++ b/src/client/clienttransfermanager.cpp
@@ -32,12 +32,6 @@ ClientTransferManager::ClientTransferManager(QObject *parent)
 }
 
 
-const ClientTransfer *ClientTransferManager::transfer(const QUuid &uuid) const
-{
-    return qobject_cast<const ClientTransfer *>(transfer_(uuid));
-}
-
-
 void ClientTransferManager::onCoreTransferAdded(const QUuid &uuid)
 {
     if (uuid.isNull()) {
diff --git a/src/client/clienttransfermanager.h b/src/client/clienttransfermanager.h
index 3c50a869..f837694d 100644
--- a/src/client/clienttransfermanager.h
+++ b/src/client/clienttransfermanager.h
@@ -35,8 +35,6 @@ class ClientTransferManager : public TransferManager
 public:
     ClientTransferManager(QObject *parent = 0);
 
-    const ClientTransfer *transfer(const QUuid &uuid) const;
-
 public slots:
     void onCoreTransferAdded(const QUuid &uuid);
     void onTransferInitDone();
diff --git a/src/common/transfermanager.cpp b/src/common/transfermanager.cpp
index 5e5af46e..c90adfb3 100644
--- a/src/common/transfermanager.cpp
+++ b/src/common/transfermanager.cpp
@@ -31,9 +31,9 @@ TransferManager::TransferManager(QObject *parent)
 }
 
 
-Transfer *TransferManager::transfer_(const QUuid &uuid) const
+Transfer *TransferManager::transfer(const QUuid &uuid) const
 {
-    return _transfers.value(uuid, 0);
+    return _transfers.value(uuid, nullptr);
 }
 
 
diff --git a/src/common/transfermanager.h b/src/common/transfermanager.h
index 941e11ce..72f9fb99 100644
--- a/src/common/transfermanager.h
+++ b/src/common/transfermanager.h
@@ -36,13 +36,13 @@ public:
     TransferManager(QObject *parent = 0);
     inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
 
+    Transfer *transfer(const QUuid &uuid) const;
     QList<QUuid> transferIds() const;
 
 signals:
     void transferAdded(const Transfer *transfer);
 
 protected:
-    Transfer *transfer_(const QUuid &uuid) const;
     void addTransfer(Transfer *transfer);
 
 protected slots:
diff --git a/src/core/coretransfermanager.cpp b/src/core/coretransfermanager.cpp
index eb01263f..aa370992 100644
--- a/src/core/coretransfermanager.cpp
+++ b/src/core/coretransfermanager.cpp
@@ -30,12 +30,6 @@ CoreTransferManager::CoreTransferManager(QObject *parent)
 }
 
 
-CoreTransfer *CoreTransferManager::transfer(const QUuid &uuid) const
-{
-    return qobject_cast<CoreTransfer *>(transfer_(uuid));
-}
-
-
 void CoreTransferManager::addTransfer(CoreTransfer *transfer)
 {
     TransferManager::addTransfer(transfer);
diff --git a/src/core/coretransfermanager.h b/src/core/coretransfermanager.h
index 8d8d5760..7553502c 100644
--- a/src/core/coretransfermanager.h
+++ b/src/core/coretransfermanager.h
@@ -34,8 +34,6 @@ class CoreTransferManager : public TransferManager
 public:
     CoreTransferManager(QObject *parent = 0);
 
-    CoreTransfer *transfer(const QUuid &uuid) const;
-
 public slots:
     void addTransfer(CoreTransfer *transfer);