From: Elvis Angelaccio Date: Sun, 31 May 2020 21:43:46 +0000 (+0200) Subject: Fix FIFO usage X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c16f777b289fb617217c8c19aa320fbe90f38209 Fix FIFO usage `m_propriorityQueue` and `m_queue` are used as FIFO queues, so we need to use `takeFirst()` instead of `takeLast()` when removing elements from the queue. While at it, add a comment so that we will remember these are FIFO queues. --- diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp index 05a6ff447..4d6a4861c 100644 --- a/src/kitemviews/private/kdirectorycontentscounter.cpp +++ b/src/kitemviews/private/kdirectorycontentscounter.cpp @@ -104,7 +104,7 @@ void KDirectoryContentsCounter::slotResult(const QString& path, int count, long } if (!m_priorityQueue.isEmpty()) { - startWorker(m_priorityQueue.takeLast()); + startWorker(m_priorityQueue.takeFirst()); } else if (!m_queue.isEmpty()) { startWorker(m_queue.takeFirst()); } diff --git a/src/kitemviews/private/kdirectorycontentscounter.h b/src/kitemviews/private/kdirectorycontentscounter.h index 01bf30779..65c4bcb1b 100644 --- a/src/kitemviews/private/kdirectorycontentscounter.h +++ b/src/kitemviews/private/kdirectorycontentscounter.h @@ -72,6 +72,7 @@ private: private: KFileItemModel* m_model; + // Used as FIFO queues. QLinkedList m_priorityQueue; QLinkedList m_queue;