diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-04-05 19:49:05 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-04-07 13:05:50 +0000 |
commit | 51028d147289c2e388684ad195f5ec2daa2e7b3e (patch) | |
tree | 52f1974b83e7fc17136c7c9f263f2fbdfe3f52b4 /src/corelib/tools/qqueue.h | |
parent | 32849f4997e13f540a6c99c9a644239e19839d73 (diff) |
QQueue: unhide QList::swap(int, int)
Task-number: QTBUG-34197
Change-Id: I0b405ab0fabff8852b2705d651848fbff74fc4c2
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/corelib/tools/qqueue.h')
-rw-r--r-- | src/corelib/tools/qqueue.h | 5 |
1 files changed, 5 insertions, 0 deletions
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<T> &other) { QList<T>::swap(other); } // prevent QList<->QQueue swaps +#ifndef Q_QDOC + // bring in QList::swap(int, int). We cannot say using QList<T>::swap, + // because we don't want to make swap(QList&) available. + inline void swap(int i, int j) { QList<T>::swap(i, j); } +#endif inline void enqueue(const T &t) { QList<T>::append(t); } inline T dequeue() { return QList<T>::takeFirst(); } inline T &head() { return QList<T>::first(); } |