diff options
author | Moritz 'Morty' Strübe <moritz.struebe@redheads.de> | 2020-03-19 17:51:12 (GMT) |
---|---|---|
committer | Moritz 'Morty' Strübe <moritz.struebe@redheads.de> | 2020-03-19 17:51:12 (GMT) |
commit | 110cb591c076f84b6dee49b3fa2a1ebc107f7945 (patch) | |
tree | 9640b6e397a54a4308b37b0a27a95ef0c8c4b34a | |
parent | cf5e0a3dbd3a31c2314e58e55bbdff66b3f49876 (diff) | |
download | Doxygen-110cb591c076f84b6dee49b3fa2a1ebc107f7945.zip Doxygen-110cb591c076f84b6dee49b3fa2a1ebc107f7945.tar.gz Doxygen-110cb591c076f84b6dee49b3fa2a1ebc107f7945.tar.bz2 |
Replace qqueue with std::queue
-rw-r--r-- | src/dotrunner.cpp | 9 | ||||
-rw-r--r-- | src/dotrunner.h | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/dotrunner.cpp b/src/dotrunner.cpp index fc9f85c..208250a 100644 --- a/src/dotrunner.cpp +++ b/src/dotrunner.cpp @@ -257,26 +257,27 @@ error: void DotRunnerQueue::enqueue(DotRunner *runner) { QMutexLocker locker(&m_mutex); - m_queue.enqueue(runner); + m_queue.push(runner); m_bufferNotEmpty.wakeAll(); } DotRunner *DotRunnerQueue::dequeue() { QMutexLocker locker(&m_mutex); - while (m_queue.isEmpty()) + while (m_queue.empty()) { // wait until something is added to the queue m_bufferNotEmpty.wait(&m_mutex); } - DotRunner *result = m_queue.dequeue(); + DotRunner *result = m_queue.front(); + m_queue.pop(); return result; } uint DotRunnerQueue::count() const { QMutexLocker locker(&m_mutex); - return m_queue.count(); + return m_queue.size(); } //-------------------------------------------------------------------- diff --git a/src/dotrunner.h b/src/dotrunner.h index 1b68c18..48b3dcb 100644 --- a/src/dotrunner.h +++ b/src/dotrunner.h @@ -20,7 +20,7 @@ #include "qlist.h" #include "qwaitcondition.h" #include "qthread.h" -#include "qqueue.h" +#include <queue> #include "qmutex.h" /** Minimal constant string class that is thread safe, once initialized. */ @@ -115,7 +115,7 @@ class DotRunnerQueue uint count() const; private: QWaitCondition m_bufferNotEmpty; - QQueue<DotRunner> m_queue; + std::queue<DotRunner *> m_queue; mutable QMutex m_mutex; }; |