From 51028d147289c2e388684ad195f5ec2daa2e7b3e Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sun, 5 Apr 2015 19:49:05 +0200 Subject: [PATCH] QQueue: unhide QList::swap(int, int) Task-number: QTBUG-34197 Change-Id: I0b405ab0fabff8852b2705d651848fbff74fc4c2 Reviewed-by: Kai Koehne --- src/corelib/tools/qqueue.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/corelib/tools/qqueue.h b/src/corelib/tools/qqueue.h index ae07c7d026..9d5bda1210 100644 --- a/src/corelib/tools/qqueue.h +++ b/src/corelib/tools/qqueue.h @@ -46,6 +46,11 @@ public: inline QQueue() {} inline ~QQueue() {} inline void swap(QQueue &other) { QList::swap(other); } // prevent QList<->QQueue swaps +#ifndef Q_QDOC + // bring in QList::swap(int, int). We cannot say using QList::swap, + // because we don't want to make swap(QList&) available. + inline void swap(int i, int j) { QList::swap(i, j); } +#endif inline void enqueue(const T &t) { QList::append(t); } inline T dequeue() { return QList::takeFirst(); } inline T &head() { return QList::first(); }