Replace QQueue with std::queue

Change-Id: I97025241845a40128f94046d2715b166ddda392c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

2 files changed, 9 insertions, 8 deletions

diff --git a/tests/fuzzy-test/fuzzytester.cpp b/tests/fuzzy-test/fuzzytester.cpp
index c1b6f1dd3..16e05ae36 100644
--- a/tests/fuzzy-test/fuzzytester.cpp
+++ b/tests/fuzzy-test/fuzzytester.cpp
@@ -200,18 +200,19 @@ bool FuzzyTester::runQbs(const QString &buildDir, const QString &command, QStrin
     QStringList commandLine = QStringList(command) << "-d" << buildDir;
     if (m_log) {
         commandLine << "-vv";
-        const int maxLoggedCommits = 2;
-        Q_ASSERT(m_commitsWithLogFiles.count() <= maxLoggedCommits + 1);
-        if (m_commitsWithLogFiles.count() == maxLoggedCommits + 1) {
+        const size_t maxLoggedCommits = 2;
+        Q_ASSERT(m_commitsWithLogFiles.size() <= maxLoggedCommits + 1);
+        if (m_commitsWithLogFiles.size() == maxLoggedCommits + 1) {
             static const QStringList allActivities = QStringList() << resolveIncrementalActivity()
                     << buildIncrementalActivity() << buildFromScratchActivity();
-            const QString oldCommit = m_commitsWithLogFiles.dequeue();
+            const QString oldCommit = m_commitsWithLogFiles.front();
+            m_commitsWithLogFiles.pop();
             foreach (const QString &a, allActivities)
                 QFile::remove(logFilePath(oldCommit, a));
         }
         qbs.setStandardErrorFile(logFilePath(m_currentCommit, m_currentActivity));
-        if (m_commitsWithLogFiles.isEmpty() || m_commitsWithLogFiles.last() != m_currentCommit)
-            m_commitsWithLogFiles.enqueue(m_currentCommit);
+        if (m_commitsWithLogFiles.empty() || m_commitsWithLogFiles.back() != m_currentCommit)
+            m_commitsWithLogFiles.push(m_currentCommit);
     } else {
         commandLine << "-qq";
     }
diff --git a/tests/fuzzy-test/fuzzytester.h b/tests/fuzzy-test/fuzzytester.h
index 03a0b5fec..846e7d14f 100644
--- a/tests/fuzzy-test/fuzzytester.h
+++ b/tests/fuzzy-test/fuzzytester.h
@@ -28,10 +28,10 @@
 #ifndef QBS_FUZZYTESTER_H
 #define QBS_FUZZYTESTER_H
 
-#include <QtCore/qqueue.h>
 #include <QtCore/qstringlist.h>
 
 #include <exception>
+#include <queue>
 
 class TestError {
 public:
@@ -76,7 +76,7 @@ private:
     QString m_headCommit;
     QString m_currentCommit;
     QString m_currentActivity;
-    QQueue<QString> m_commitsWithLogFiles;
+    std::queue<QString> m_commitsWithLogFiles;
     QStringList m_unbuildableCommits;
     QStringList m_buildableCommits;
 };