From 72205c829b63736e016f4fc2bb0f8fc4bb2fee5e Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 16 Jul 2020 17:04:14 +0200 Subject: [PATCH] QQueue: purge deprecated API, swap(i, j) Was deprecated in 5.14 although the relevant annotations won't show up until 5.15.1. Change-Id: I5b88bd109b9785d8170c616c619d478969536bbf Reviewed-by: Lars Knoll --- src/corelib/tools/qqueue.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/corelib/tools/qqueue.h b/src/corelib/tools/qqueue.h index 8dddf05352..862aa2ae2c 100644 --- a/src/corelib/tools/qqueue.h +++ b/src/corelib/tools/qqueue.h @@ -51,11 +51,6 @@ class QQueue : public QList public: // compiler-generated special member functions are fine! inline void swap(QQueue &other) noexcept { QList::swap(other); } // prevent QList<->QQueue swaps -#if QT_DEPRECATED_SINCE(5, 14) && !defined(Q_QDOC) - // NOT using QList::swap; it would make swap(QList&) available. - QT_DEPRECATED_VERSION_X_5_14("Use swapItemsAt(i, j) instead") - inline void swap(int i, int j) { QList::swapItemsAt(i, j); } -#endif inline void enqueue(const T &t) { QList::append(t); } inline T dequeue() { return QList::takeFirst(); } inline T &head() { return QList::first(); }