summaryrefslogtreecommitdiffstats
path: root/src/network/access
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2021-08-27 09:33:27 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2021-08-27 21:17:04 +0200
commit587d64507a0e419c089a83d0cf30026bf3b6bd20 (patch)
treecc74aa5c10410a6bb219c9a117d29e25fbaa50e4 /src/network/access
parentba8f9d8d92ba4fd9aaf6e0885b56b56e25acfc45 (diff)
QNetworkAccessCache: Remove unused code
The function was never called. As a consequence receiverQueue was only ever read and never written. Change-Id: I30905446452d9f263124d3af08c42e2e1b0cafbe Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/access')
-rw-r--r--src/network/access/qnetworkaccesscache.cpp41
-rw-r--r--src/network/access/qnetworkaccesscache_p.h1
2 files changed, 0 insertions, 42 deletions
diff --git a/src/network/access/qnetworkaccesscache.cpp b/src/network/access/qnetworkaccesscache.cpp
index 865dcab6c8..4c37212b97 100644
--- a/src/network/access/qnetworkaccesscache.cpp
+++ b/src/network/access/qnetworkaccesscache.cpp
@@ -64,7 +64,6 @@ namespace {
struct QNetworkAccessCache::Node
{
QDateTime timestamp;
- std::vector<Receiver> receiverQueue;
QByteArray key;
Node *older, *newer;
@@ -305,30 +304,6 @@ bool QNetworkAccessCache::hasEntry(const QByteArray &key) const
return hash.contains(key);
}
-bool QNetworkAccessCache::requestEntry(const QByteArray &key, QObject *target, const char *member)
-{
- Node *node = hash.value(key);
- if (!node)
- return false;
-
- if (node->useCount > 0 && !node->object->shareable) {
- // object is not shareable and is in use
- // queue for later use
- Q_ASSERT(node->older == nullptr && node->newer == nullptr);
- node->receiverQueue.push_back({target, member});
-
- // request queued
- return true;
- } else {
- // node not in use or is shareable
- if (unlinkEntry(key))
- updateTimer();
-
- ++node->useCount;
- return emitEntryReady(node, target, member);
- }
-}
-
QNetworkAccessCache::CacheableObject *QNetworkAccessCache::requestEntryNow(const QByteArray &key)
{
Node *node = hash.value(key);
@@ -364,22 +339,6 @@ void QNetworkAccessCache::releaseEntry(const QByteArray &key)
Q_ASSERT(node->useCount > 0);
- // are there other objects waiting?
- const auto objectStillExists = [](const Receiver &r) { return !r.object.isNull(); };
-
- auto &queue = node->receiverQueue;
- auto qit = std::find_if(queue.begin(), queue.end(), objectStillExists);
-
- const Receiver receiver = qit == queue.end() ? Receiver{} : std::move(*qit++) ;
-
- queue.erase(queue.begin(), qit);
-
- if (receiver.object) {
- // queue another activation
- emitEntryReady(node, receiver.object, receiver.member);
- return;
- }
-
if (!--node->useCount) {
// no objects waiting; add it back to the expiry list
if (node->object->expires)
diff --git a/src/network/access/qnetworkaccesscache_p.h b/src/network/access/qnetworkaccesscache_p.h
index e31722e6fd..cd75ce62ae 100644
--- a/src/network/access/qnetworkaccesscache_p.h
+++ b/src/network/access/qnetworkaccesscache_p.h
@@ -98,7 +98,6 @@ public:
void addEntry(const QByteArray &key, CacheableObject *entry, qint64 connectionCacheExpiryTimeoutSeconds = -1);
bool hasEntry(const QByteArray &key) const;
- bool requestEntry(const QByteArray &key, QObject *target, const char *member);
CacheableObject *requestEntryNow(const QByteArray &key);
void releaseEntry(const QByteArray &key);
void removeEntry(const QByteArray &key);