diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-01-20 13:52:58 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-01-28 13:38:15 +0000 |
| commit | ef7f6e5cc41c1a2bf99fb3ab898e52d9e5262878 (patch) | |
| tree | d244b8dcda2b3fd083668c43d087a83294ce7227 /src | |
| parent | c2ea752f684290d156c500c6a7174fe3f27fa086 (diff) | |
Fix build and warnings
- QOpenGLDebugLogger moved to separate module
- QList == QVector
- Removed circular buffer and frame allocator
- Various warnings
Change-Id: I7caf55779c34d66c9d075e5191872c0a2ac6ddce
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
19 files changed, 15 insertions, 3652 deletions
diff --git a/src/core/changes/qpropertynodeaddedchange_p.h b/src/core/changes/qpropertynodeaddedchange_p.h index 2930867ea..50840501c 100644 --- a/src/core/changes/qpropertynodeaddedchange_p.h +++ b/src/core/changes/qpropertynodeaddedchange_p.h @@ -60,7 +60,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { class QPropertyUpdatedChange; -class QFrameAllocator; class QPropertyNodeAddedChangePrivate : public QStaticPropertyValueAddedChangeBasePrivate { diff --git a/src/core/changes/qpropertynoderemovedchange_p.h b/src/core/changes/qpropertynoderemovedchange_p.h index 0145cc507..8df349757 100644 --- a/src/core/changes/qpropertynoderemovedchange_p.h +++ b/src/core/changes/qpropertynoderemovedchange_p.h @@ -60,7 +60,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { class QPropertyUpdatedChange; -class QFrameAllocator; class QPropertyNodeRemovedChangePrivate : public QStaticPropertyValueRemovedChangeBasePrivate { diff --git a/src/core/changes/qstaticpropertyupdatedchangebase_p.h b/src/core/changes/qstaticpropertyupdatedchangebase_p.h index 3f76e2f56..6b7d4c974 100644 --- a/src/core/changes/qstaticpropertyupdatedchangebase_p.h +++ b/src/core/changes/qstaticpropertyupdatedchangebase_p.h @@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { class QPropertyUpdatedChange; -class QFrameAllocator; class QStaticPropertyUpdatedChangeBasePrivate : public QPropertyUpdatedChangeBasePrivate { diff --git a/src/core/resources/qboundedcircularbuffer_p.h b/src/core/resources/qboundedcircularbuffer_p.h deleted file mode 100644 index 22299d7da..000000000 --- a/src/core/resources/qboundedcircularbuffer_p.h +++ /dev/null @@ -1,149 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H -#define QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QtCore/QReadWriteLock> -#include <QtCore/QReadLocker> -#include <QtCore/QSemaphore> -#include <QtCore/QtGlobal> - -#include <Qt3DCore/private/qcircularbuffer_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3DCore { - -template <class T> -class QBoundedCircularBuffer -{ -public: - explicit QBoundedCircularBuffer(int capacity_) - : m_free( capacity_ ), - m_used( capacity_ ), - m_buffer( capacity_ ) - { - m_used.acquire(capacity_); - } - - int capacity() const { return m_buffer.capacity(); } - int freeSize() const { return m_free.available(); } - int size() const { return m_used.available(); } - bool isFull() const { return m_free.available() == 0; } - bool isEmpty() const { return m_used.available() == 0; } - - void push_back(const T &value) - { - m_free.acquire(); - QWriteLocker locker(&m_lock); - m_buffer.append(value); - locker.unlock(); - m_used.release(); - } - - void push(const T &t) { push_back(t); } - void append(const T &t) { push_back(t); } - - T pop_front() - { - m_used.acquire(); - QWriteLocker locker(&m_lock); - T value = m_buffer.first(); - m_buffer.remove(0); - locker.unlock(); - m_free.release(); - return value; - } - - T pop() { return pop_front(); } - T takeFirst() { return pop_front(); } - - void clear() - { - QWriteLocker locker(&m_lock); - m_buffer.clear(); - int used = m_used.available(); - m_free.release(used); - m_used.acquire(used); - } - - T at(int i) const - { - QReadLocker readLocker(&m_lock); - return m_buffer.at(i); - } - - T front() const - { - QReadLocker readLocker(&m_lock); - return m_buffer.front(); - } - - T back() const - { - QReadLocker readLocker(&m_lock); - return m_buffer.back(); - } - -protected: - Q_DISABLE_COPY(QBoundedCircularBuffer) - - QSemaphore m_free; - QSemaphore m_used; - QCircularBuffer<T> m_buffer; - mutable QReadWriteLock m_lock; -}; - -} //Qt3D - -QT_END_NAMESPACE - -#endif // QT3DCORE_QBOUNDEDCIRCULARBUFFER_P_H diff --git a/src/core/resources/qcircularbuffer_p.h b/src/core/resources/qcircularbuffer_p.h deleted file mode 100644 index e10b7236d..000000000 --- a/src/core/resources/qcircularbuffer_p.h +++ /dev/null @@ -1,1330 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DCORE_QCIRCULARBUFFER_H -#define QT3DCORE_QCIRCULARBUFFER_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <Qt3DCore/qt3dcore_global.h> -#include <QtCore/QtGlobal> -#include <QtCore/qlist.h> -#include <QtCore/qpair.h> -#include <QtCore/qshareddata.h> -#include <QtCore/qvector.h> - -#include <algorithm> -#include <iterator> -#include <limits> -#include <memory> -#include <new> - - -#ifdef Q_COMPILER_INITIALIZER_LISTS -# include <initializer_list> -#endif - -QT_BEGIN_NAMESPACE - -namespace Qt3DCore { - -class CircularBufferData : public QSharedData -{ -protected: - CircularBufferData() - : data(nullptr), - capacity(0), - size(0), - first(-1), - last(-1) - {} - - ~CircularBufferData() - { - // Release the raw memory - deallocate(data); - } - - int wraparound(int index) const - { - index = index < capacity ? index : (index - capacity); - Q_ASSERT(index < capacity); // make sure that wrapping around once was enough - return index; - } - - void *allocate(int count, size_t sizeOfT) - { return operator new[](count * sizeOfT); } - void deallocate(void *p) - { operator delete[](p); } - - void *data; // Array of the actual data -public: - int capacity; // Size of the m_data array - int size; // Number of elements of m_data actually used - int first; // Index in m_data of the first element of the circular buffer - int last; // Index in m_data of the last element of the circular buffer -}; - -template <typename T> -class TypedCircularBufferData : public CircularBufferData -{ - template <typename InputIterator> - explicit TypedCircularBufferData(InputIterator f, InputIterator l, std::input_iterator_tag) Q_DECL_EQ_DELETE; -public: - TypedCircularBufferData() : CircularBufferData() {} - template <typename ForwardIterator> - explicit TypedCircularBufferData(ForwardIterator f, ForwardIterator l, std::forward_iterator_tag) - { - const int n = int(std::distance(f, l)); - CircularBufferData::data = allocate(n); - std::uninitialized_copy(f, l, data()); - first = 0; - last = n - 1; - size = capacity = n; - } - ~TypedCircularBufferData() - { - if (QTypeInfo<T>::isComplex && size != 0) { - // The type is complex so we manually call the destructor for each item - // since we used the placement new operator to instantiate them - if (first <= last) { - // Destroy items from first to last - T *b = data() + first; - T *i = b + size; - while (i-- != b) - i->~T(); - } else { - // Destroy items at end of data array - T *b = data() + first; - T *i = data() + capacity; - while (i-- != b) - i->~T(); - - // Destroy items at beginning of data array - b = data(); - i = b + last; - while (i-- != b) - i->~T(); - } - } - - } - - using CircularBufferData::wraparound; - T *allocate(int count) { return static_cast<T*>(CircularBufferData::allocate(count, sizeof(T))); } - using CircularBufferData::deallocate; - T *data() const { return static_cast<T*>(CircularBufferData::data); } - void setData(T *newdata) { CircularBufferData::data = static_cast<void*>(newdata); } -}; - -template <typename T> -class QCircularBuffer -{ - typedef TypedCircularBufferData<T> Data; -public: - typedef QPair<T*,int> array_range; - typedef QPair<const T*,int> const_array_range; - typedef array_range ArrayRange; - typedef const_array_range ConstArrayRange; - - QCircularBuffer() - : d(new Data()) - {} - - explicit QCircularBuffer(int amount); - explicit QCircularBuffer(int amount, const T &val); - explicit QCircularBuffer(int amount, int initialSize, const T &value); -#ifdef Q_COMPILER_INITIALIZER_LISTS - QCircularBuffer(std::initializer_list<T> list) - : d(new Data(list.begin(), list.end(), std::random_access_iterator_tag())) - {} -#endif - template <typename ForwardIterator> - explicit QCircularBuffer(ForwardIterator f, ForwardIterator l) - : d(new Data(f, l, typename std::iterator_traits<ForwardIterator>::iterator_category())) - {} - - QCircularBuffer(const QCircularBuffer<T> &other) - : d(other.d) - {} - - void swap(QCircularBuffer &other) { d.swap(other.d); } - - QCircularBuffer<T> &operator = (const QCircularBuffer<T> &other) - { - d = other.d; - return *this; - } - - ~QCircularBuffer() {} - - class iterator - { - public: - typedef std::random_access_iterator_tag iterator_category; - typedef ptrdiff_t difference_type; - typedef T value_type; - typedef T *pointer; - typedef T &reference; - - Q_DECL_CONSTEXPR iterator() : buffer(nullptr), index(-1) {} - iterator(QCircularBuffer<T> *buf, int idx) - : buffer(buf), index(idx) - {} - - T &operator*() const { return (*buffer)[ index ]; } - T *operator->() const { return &(*buffer)[index]; } - T &operator[](int j) const { return (*buffer)[ index + j ]; } - - bool operator==(const iterator &other) const - { - return (buffer == other.buffer && index == other.index); - } - - bool operator!=(const iterator &other) const - { - return (buffer != other.buffer || index != other.index); - } - - bool operator<(const iterator &other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::iterator::operator<", "iterators use different buffers"); - return index < other.index; - } - - bool operator<=(const iterator &other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::iterator::operator<=", "iterators use different buffers"); - return index <= other.index; - } - - bool operator>(const iterator &other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::iterator::operator>", "iterators use different buffers"); - return index > other.index; - } - - bool operator>=(const iterator &other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::iterator::operator>=", "iterators use different buffers"); - return index >= other.index; - } - - iterator &operator++() { ++index; return *this; } - iterator operator++(int) - { - iterator ans = *this; - ++index; - return ans; - } - - iterator &operator--() { --index; return *this; } - iterator operator--(int) - { - iterator ans = *this; - --index; - return ans; - } - - iterator &operator+=(int j) { index += j; return *this; } - iterator &operator-=(int j) { index -= j; return *this; } - iterator operator+(int j) const { return iterator(buffer, index + j); } - iterator operator-(int j) const { return iterator(buffer, index - j); } - int operator-(iterator other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::iterator::operator-", "iterators use different buffers"); - return index - other.index; - } - - private: - QCircularBuffer<T> *buffer; - int index; - friend class QCircularBuffer; - }; - friend class iterator; - - class const_iterator - { - public: - typedef std::random_access_iterator_tag iterator_category; - typedef ptrdiff_t difference_type; - typedef T value_type; - typedef const T *pointer; - typedef const T &reference; - - Q_DECL_CONSTEXPR const_iterator() : buffer(nullptr), index(-1) {} - const_iterator(const QCircularBuffer<T> *buff, int idx) - : buffer(buff), index(idx) - {} - const_iterator(const iterator &other) - : buffer(other.buffer), index(other.index) - {} - - const T &operator*() const { return buffer->at(index); } - const T *operator->() const { return &buffer->at(index); } - const T &operator[](int j) const { return buffer->at(index + j); } - - bool operator==(const const_iterator &other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::const_iterator::operator==", "iterators use different buffers"); - return index == other.index; - } - - bool operator!=(const const_iterator &other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::const_iterator::operator!=", "iterators use different buffers"); - return index != other.index; - } - - bool operator<(const const_iterator &other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::const_iterator::operator<", "iterators use different buffers"); - return index < other.index; - } - - bool operator<=(const const_iterator &other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::const_iterator::operator<=", "iterators use different buffers"); - return index <= other.index; - } - - bool operator>(const const_iterator &other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::const_iterator::operator>", "iterators use different buffers"); - return index > other.index; - } - - bool operator>=(const const_iterator &other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::const_iterator::operator>=", "iterators use different buffers"); - return index >= other.index; - } - - const_iterator &operator++() { ++index; return *this; } - const_iterator operator++(int) - { - const_iterator ans = *this; - ++index; - return ans; - } - - const_iterator &operator--() { --index; return *this; } - const_iterator operator--(int) - { - const_iterator ans = *this; - --index; - return ans; - } - - const_iterator &operator+=(int j) { index += j; return *this; } - const_iterator &operator-=(int j) { index -= j; return *this; } - const_iterator operator+(int j) const { return const_iterator(buffer, index + j); } - const_iterator operator-(int j) const { return const_iterator(buffer, index - j); } - int operator-(const_iterator other) const - { - Q_ASSERT_X(buffer == other.buffer, "QCircularBuffer<T>::const_iterator::operator-", "iterators use different buffers"); - return index - other.index; - } - - private: - const QCircularBuffer<T> *buffer; - int index; - friend class QCircularBuffer; - }; - friend class const_iterator; - - typedef std::reverse_iterator<iterator> reverse_iterator; - typedef std::reverse_iterator<const_iterator> const_reverse_iterator; - - iterator begin() { return iterator(this, 0); } - const_iterator begin() const { return const_iterator(this, 0); } - const_iterator cbegin() const { return const_iterator(this, 0); } - reverse_iterator rbegin() { return reverse_iterator(end()); } - const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); } - const_reverse_iterator crbegin() const { return const_reverse_iterator(end()); } - const_iterator constBegin() const { return const_iterator(this, 0); } - iterator end() { return iterator(this, d->size); } - const_iterator end() const { return const_iterator(this, d->size); } - const_iterator cend() const { return const_iterator(this, d->size); } - reverse_iterator rend() { return reverse_iterator(begin()); } - const_reverse_iterator rend() const { return const_reverse_iterator(begin()); } - const_reverse_iterator crend() const { return const_reverse_iterator(begin()); } - const_iterator constEnd() const { return const_iterator(this, d->size); } - iterator insert(const_iterator before, int number, const T &val) - { - insert(before.index, number, val); - return iterator(this, before.index); - } - iterator insert(const_iterator before, const T &val) { return insert(before, 1, val); } - iterator erase(const_iterator b, const_iterator e) - { - int number = e - b; - remove(b.index, number); - return iterator(this, e.index - number); - } - iterator erase(const_iterator pos) { return erase(pos, pos + 1); } - - // STL compatibility - typedef T value_type; - typedef value_type *pointer; - typedef const value_type *const_pointer; - typedef value_type &reference; - typedef const value_type &const_reference; - typedef ptrdiff_t difference_type; - typedef iterator Iterator; - typedef const_iterator ConstIterator; - typedef int size_type; - - void push_back(const T &t) { append(t); } - void push_front(const T &t) { prepend(t); } - void pop_back() { Q_ASSERT(!isEmpty()); erase(end() - 1); } - void pop_front() { Q_ASSERT(!isEmpty()); erase(begin()); } - bool empty() const { return isEmpty(); } - T &front() { return first(); } - const T &front() const { return first(); } - T &back() { return last(); } - const T &back() const { return last(); } - - QAtomicInt refCount() const { return d->ref; } - - void append(const T &val); - - const T &at(int i) const - { - Q_ASSERT_X(i >= 0 && i < d->size, "QCircularBuffer<T>::at", "index out of range"); - return d->data()[d->wraparound(d->first + i)]; - } - - const T &operator[](int i) const - { - Q_ASSERT_X(i >= 0 && i < d->size, "QCircularBuffer<T>::operator[]", "index out of range"); - return d->data()[d->wraparound(d->first + i)]; - } - - T &operator[](int i) - { - d.detach(); - Q_ASSERT_X(i >= 0 && i < d->size, "QCircularBuffer<T>::operator[]", "index out of range"); - return d->data()[d->wraparound(d->first + i)]; - } - - int capacity() const { return d->capacity; } - - void clear() { *this = QCircularBuffer<T>(d->capacity); } - - bool contains(const T &val) const; - int count(const T &val) const; - int count() const { return size(); } - - array_range data() - { - d.detach(); - if (d->size == 0) - return array_range(nullptr, 0); - if (!isLinearised()) - linearise(); - return array_range(d->data() + d->first, d->last - d->first + 1); - } - const_array_range data() const { return constData(); } - const_array_range constData() const - { - if (!isLinearised() || d->size == 0) - return const_array_range(nullptr, 0); - return const_array_range(d->data() + d->first, d->last - d->first + 1); - } - - array_range dataOne() - { - d.detach(); - if (d->size == 0) - return array_range(nullptr, 0); - if (isLinearised()) - return array_range(d->data() + d->first, d->last - d->first + 1); - else - return array_range(d->data() + d->first, d->capacity - d->first); - } - const_array_range dataOne() const { return constDataOne(); } - const_array_range constDataOne() const - { - if (d->size == 0) - return const_array_range(nullptr, 0); - if (isLinearised()) - return const_array_range(d->data() + d->first, d->last - d->first + 1); - else - return const_array_range(d->data() + d->first, d->capacity - d->first); - } - - array_range dataTwo() - { - d.detach(); - if (d->size == 0 || isLinearised()) - return array_range(nullptr, 0); - return array_range(d->data(), d->last + 1); - } - const_array_range dataTwo() const { return constDataTwo(); } - const_array_range constDataTwo() const - { - if (d->size == 0 || isLinearised()) - return const_array_range(nullptr, 0); - return const_array_range(d->data(), d->last + 1); - } - - bool endsWith(const T &val) const { return !isEmpty() && last() == val; } - QCircularBuffer<T> &fill(const T &val, int number = -1); - T &first() { Q_ASSERT(!isEmpty()); d.detach(); return d->data()[ d->first ]; } - const T &first() const { Q_ASSERT(!isEmpty()); return d->data()[ d->first ]; } - int freeSize() const { return sizeAvailable(); } - - static QCircularBuffer<T> fromList(const QList<T> &list) - { return QCircularBuffer(list.begin(), list.end()); } - static QCircularBuffer<T> fromVector(const QVector<T> &vector) - { return QCircularBuffer(vector.begin(), vector.end()); } - - int indexOf(const T &val, int from = 0) const; - void insert(int i, const T &val) { insert(i, 1, val); } - void insert(int i, int number, const T &val); - bool isEmpty() const { return d->size == 0; } - bool isFull() const { return d->size == d->capacity; } - bool isLinearised() const { return (d->last >= d->first); } - T &last() { Q_ASSERT(!isEmpty()); return d->data()[ d->last ]; } - const T &last() const { Q_ASSERT(!isEmpty()); return d->data()[ d->last ]; } - int lastIndexOf(const T &val, int from = -1) const; - void linearise() - { - if (!isLinearised()) { - QCircularBuffer linearized(this->cbegin(), this->cend()); - swap(linearized); - } - } - - void prepend(const T &val); - void remove(int i) { remove(i, 1); } - void remove(int i, int number); - - void replace(int i, const T &val) - { - Q_ASSERT_X(i >= 0 && i < d->size, "QCircularBuffer<T>::replace", "index out of range"); - const T copy(val); - (*this)[ i ] = copy; - } - - void reserve(int amount) { setCapacity(amount); } - void resize(int newSize); - void setCapacity(int amount); - int size() const { return d->size; } - Q_DECL_CONSTEXPR int max_size() const { return std::numeric_limits<size_type>::max(); } - int sizeAvailable() const { return d->capacity - d->size; } - void squeeze() { setCapacity(size()); } - bool startsWith(const T &val) const { return !isEmpty() && first() == val; } - - QList<T> toList() const; - QVector<T> toVector() const; - - T value(int i) const - { - if (i < 0 || i >= d->size) - return T(); - return at(i); - } - - T value(int i, const T &defaultValue) const - { - if (i < 0 || i >= d->size) - return defaultValue; - return at(i); - } - - QCircularBuffer<T> &operator+=(const T &other) { append(other); return *this; } - QCircularBuffer<T> &operator+=(const QCircularBuffer<T> &other); - QCircularBuffer<T> &operator+=(const QVector<T> &other); - QCircularBuffer<T> &operator+=(const QList<T> &other); - - QCircularBuffer<T> &operator<<(const T &other) { append(other); return *this; } - QCircularBuffer<T> &operator<<(const QCircularBuffer<T> &other) { *this += other; return *this; } - QCircularBuffer<T> &operator<<(const QVector<T> &other) { *this += other; return *this; } - QCircularBuffer<T> &operator<<(const QList<T> &other) { *this += other; return *this; } - - inline bool isSharedWith(const QCircularBuffer &other) const { return d == other.d; } - -private: - QExplicitlySharedDataPointer<Data> d; -}; - -template <typename T> -QCircularBuffer<T> operator+(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs); - -template <typename T> -inline bool operator==(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) -{ return lhs.isSharedWith(rhs) || (lhs.size() == rhs.size() && std::equal(lhs.begin(), lhs.end(), rhs.begin())); } - -template <typename T> -inline bool operator!=(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) -{ return !operator==(lhs, rhs); } - -template <typename T> -inline void swap(QCircularBuffer<T> &lhs, QCircularBuffer<T> &rhs) -{ lhs.swap(rhs); } - -template <typename T> -inline bool operator< (const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) -{ return std::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end()); } - -template <typename T> -inline bool operator> (const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) -{ return operator<(rhs, lhs); } - -template <typename T> -inline bool operator>=(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) -{ return !operator<(lhs, rhs); } - -template <typename T> -inline bool operator<=(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) -{ return !operator>(lhs, rhs); } - -// out-of-line function implementations: - -#ifndef Q_QDOC - -template <typename T> -QCircularBuffer<T>::QCircularBuffer(int amount) - : d(new Data()) -{ - // Allocate some raw memory - d->setData(d->allocate(amount)); - d->capacity = amount; - - // Initialize memory block to zero - memset(d->data(), 0, amount * sizeof(T)); -} - -template <typename T> -QCircularBuffer<T>::QCircularBuffer(int amount, const T &val) - : d(new Data()) -{ - // Allocate some raw memory - d->setData(d->allocate(amount)); - d->capacity = amount; - - // Initialize the objects. In this case we always use the placement new operator - T *b = d->data(); - T *i = b + d->capacity; - while (i != b) - new (--i) T(val); - d->first = 0; - d->last = d->capacity - 1; - d->size = d->capacity; -} - -template <typename T> -QCircularBuffer<T>::QCircularBuffer(int amount, int initialSize, const T &val) - : d(new Data()) -{ - Q_ASSERT_X(amount >= initialSize, "QCircularBuffer<T>::QCircularBuffer(int capacity, int size, const T &value)", "size is greater than capacity"); - - // Allocate some raw memory - d->setData(d->allocate(amount)); - d->capacity = amount; - - // Initialize the objects that need to be set to the specified value. - // In this case we always use the placement new operator - T *b = d->data(); - T *i = b + initialSize; - while (i != b) - new (--i) T(val); - - // Initialize the remaining memory to zero - memset(d->data() + initialSize, 0, (amount - initialSize) * sizeof(T)); - - d->first = 0; - d->last = initialSize - 1; - d->size = initialSize; -} - -template <typename T> -void QCircularBuffer<T>::append(const T &val) -{ - // If we have no capacity we do nothing - if (!d->capacity) - return; - d.detach(); - if (d->size == d->capacity) { - // Buffer is full. Overwrite earliest item and rotate - d->data()[ d->first ] = val; - d->first = d->wraparound(++d->first); - d->last = d->wraparound(++d->last); - } else if (d->size != 0) { - // Buffer is partially full. Append data to end of array using appropriate method - int index = d->wraparound(d->first + d->size); - if (QTypeInfo<T>::isComplex) - new (d->data() + index) T(val); - else - d->data()[ index ] = val; - ++d->size; - ++d->last; - } else { - // Buffer is empty. Append data to end of array using appropriate method - d->size = 1; - d->first = d->last = 0; - if (QTypeInfo<T>::isComplex) - new (d->data() + d->first) T(val); - else - d->data()[ d->first ] = val; - } -} - -template <typename T> -bool QCircularBuffer<T>::contains(const T &val) const -{ - if (isLinearised()) { - T *b = d->data() + d->first; - T *i = b + d->size; - while (i != b) - if (*--i == val) - return true; - return false; - } else { - // Check the array from m_first to the end - T *b = d->data() + d->first; - T *i = d->data() + d->capacity; - while (i != b) - if (*--i == val) - return true; - - // Check array from 0 to m_end - b = d->data(); - i = d->data() + d->last + 1; - while (i != b) - if (*--i == val) - return true; - - return false; - } -} - -template <typename T> -int QCircularBuffer<T>::count(const T &val) const -{ - int c = 0; - if (isLinearised()) { - T *b = d->data() + d->first; - T *i = b + d->size; - while (i != b) - if (*--i == val) - ++c; - } else { - // Check the array from m_first to the end - T *b = d->data() + d->first; - T *i = d->data() + d->capacity; - while (i != b) - if (*--i == val) - ++c; - - // Check array from 0 to m_end - b = d->data(); - i = d->data() + d->last + 1; - while (i != b) - if (*--i == val) - ++c; - } - return c; -} - -template <typename T> -QCircularBuffer<T> &QCircularBuffer<T>::fill(const T &val, int number) -{ - Q_ASSERT_X(d->capacity >= number, "QCircularBuffer<T>::fill", "size is greater than capacity"); - const T copy(val); - d.detach(); - int oldSize = d->size; - d->size = (number < 0 ? d->size : number); - d->first = (number == 0 ? -1 : 0); - d->last = d->size - 1; - - // Copy item into array size times - if (d->size) { - T *b = d->data(); - T *i = d->data() + d->size; - while (i != b) - *--i = copy; - } - - if (d->size < oldSize) { - // Cleanup old items beyond end of new array - T *b = d->data() + d->size; - T *i = d->data() + oldSize; - while (i-- != b) { - i->~T(); - //TODO: Optimize to a single memset call - memset(i, 0, sizeof(T)); - } - } - - return *this; -} - -template <typename T> -int QCircularBuffer<T>::indexOf(const T &val, int from) const -{ - Q_ASSERT_X(from < d->size, "QCircularBuffer<T>::indexOf", "from is greater than last valid index"); - if (from < 0) - from = qMax(from + d->size, 0); - else if (from >= d->size) - from = d->size - 1; - for (int i = from; i < d->size; ++i) - if (at(i) == val) - return i; - return -1; -} - -template <typename T> -void QCircularBuffer<T>::insert(int i, int number, const T &val) -{ - Q_ASSERT_X(i >= 0 && i <= d->size, "QCircularBuffer<T>::insert", "index out of range"); - d.detach(); - int freeCapacity = d->capacity - d->size; - - // Calculate number of elements that will actually be inserted. This - // depends upon where the insertion has been requested and any spare - // capacity left in the buffer. This is because elements at higher - // indices will be pushed to the right and will potentially wrap around - // to overwrite earlier elements. - int numToInsert = qMin(number, i + freeCapacity); - - // Calculate the number of elements at the beginning of the buffer that - // will be overwritten - int numToOverwrite = qMin(i, qMax(0, number - freeCapacity)); - - // Decide which way to shift to minimize the amount of copying required. - if (i < d->size / 2) { - // Inserting in lower half of buffer so we shift earlier items down - - // Shift data at the bottom end down. This may only be a subset if some - // of the early data is to be overwritten. - if (QTypeInfo<T>::isStatic) { - int b = d->first + numToOverwrite; - int e = d->first + i - 1; - for (int j = b; j <= e; ++j) { - int srcIndex = j % d->capacity; - int dstIndex = (j - numToInsert + d->capacity) % d->capacity; - T *src = d->data() + srcIndex; - T *dst = d->data() + dstIndex; - - new (dst) T(*src); - } - } else { - // We have a movable type so a simple memcopy (or maybe two or - // three) will suffice to shift the data at the bottom end - int numToMove = i - numToOverwrite; - if (numToMove > 0) { - int srcBegin = (d->first + numToOverwrite) % d->capacity; - int srcEnd = (d->first + i - 1) % d->capacity; - int dstBegin = (srcBegin - numToInsert + d->capacity) % d->capacity; - int dstEnd = (srcEnd - numToInsert + d->capacity) % d->capacity; - - // Do we have any wrap-around problems to deal with? - bool srcRegionWraps = (srcEnd < srcBegin); - bool dstRegionWraps = (dstEnd < dstBegin); - if (!srcRegionWraps && dstRegionWraps) { - // Destination region wraps so do the move in two steps - int wrapCount = abs(srcBegin - numToInsert); - memmove(d->data() + d->capacity - wrapCount, d->data() + srcBegin, wrapCount * sizeof(T)); - memmove(d->data(), d->data() + srcBegin + wrapCount, (numToMove - wrapCount) * sizeof(T)); - } else if (srcRegionWraps && !dstRegionWraps) { - // Source region wraps so do the move in two steps - int wrapCount = d->capacity - srcBegin; - memmove(d->data() + dstBegin, d->data() + d->capacity - wrapCount, wrapCount * sizeof(T)); - memmove(d->data() + dstBegin + numToInsert, d->data(), (numToMove - wrapCount) * sizeof(T)); - } else if (srcRegionWraps && dstRegionWraps) { - // Source and destination regions wrap so we have to do this in three steps - int srcWrapCount = d->capacity - srcBegin; - memmove(d->data() + dstBegin, d->data() + d->capacity - srcWrapCount, srcWrapCount * sizeof(T)); - memmove(d->data() + d->capacity - numToInsert, d->data(), numToInsert * sizeof(T)); - memmove(d->data(), d->data() + numToInsert, (numToMove - srcWrapCount - numToInsert) * sizeof(T)); - } else { - // No wrap around - do a single memmove - memmove(d->data() + dstBegin, d->data() + srcBegin, numToMove * sizeof(T)); - } - } - } - - // Insert the new items - int e = d->first + i; - int b = e - numToInsert; - for (int j = b; j < e; ++j) { - T *p = d->data() + ((j + d->capacity) % d->capacity); - new (p) T(val); - } - - // Adjust the first, last and size indices as needed. - // NB. The last index never changes in this regime. - d->size += qMin(number, freeCapacity); - d->first = (d->first - (numToInsert - numToOverwrite) + d->capacity) % d->capacity; - } else { - // Inserting in upper half of buffer so we shift later items up - - // Shift data at the top end up which may or may not overwrite some - // of the earliest data - if (QTypeInfo<T>::isStatic) { - int b = d->first + d->size - 1; - int e = d->first + i; - for (int j = b; j >= e; j--) { - int srcIndex = j % d->capacity; - int dstIndex = (j + numToInsert) % d->capacity; - T *src = d->data() + srcIndex; - T *dst = d->data() + dstIndex; - - new (dst) T(*src); - } - } else { - // We have a movable type so a simple memcopy (or maybe two or - // three) will suffice to shift the data at the top end - int numToMove = d->size - i; - if (numToMove > 0) { - int srcBegin = (d->first + i) % d->capacity; - int srcEnd = d->last; - int dstBegin = (srcBegin + numToInsert) % d->capacity; - int dstEnd = (srcEnd + numToInsert) % d->capacity; - - // Do we have any wrap-around problems to deal with? - bool srcRegionWraps = (srcEnd < srcBegin); - bool dstRegionWraps = (dstEnd < dstBegin); - if (!srcRegionWraps && dstRegionWraps) { - // Destination region wraps so do the move in two steps - int wrapCount = srcEnd + numToInsert - d->capacity + 1; - memmove(d->data(), d->data() + srcEnd - wrapCount + 1, wrapCount * sizeof(T)); - memmove(d->data() + dstBegin, d->data() + srcBegin, (numToMove - wrapCount) * sizeof(T)); - } else if (srcRegionWraps && !dstRegionWraps) { - // Source region wraps so do the move in two steps - int wrapCount = d->last + 1; - memmove(d->data() + numToInsert, d->data(), wrapCount * sizeof(T)); - memmove(d->data() + dstBegin, d->data() + srcBegin, (numToMove - wrapCount) * sizeof(T)); - } else if (srcRegionWraps && dstRegionWraps) { - // Source and destination regions wrap so we have to do this in three steps - int srcWrapCount = d->last + 1; - memmove(d->data() + numToInsert, d->data(), srcWrapCount * sizeof(T)); - memmove(d->data(), d->data() + d->capacity - numToInsert, numToInsert * sizeof(T)); - memmove(d->data() + dstBegin, d->data() + srcBegin, (numToMove - srcWrapCount - numToInsert) * sizeof(T)); - } else { - // No wrap around - do a single memmove - memmove(d->data() + dstBegin, d->data() + srcBegin, numToMove * sizeof(T)); - } - } - } - - // Insert the new items - for (int j = d->first + i; j < d->first + i + numToInsert; ++j) { - T *p = d->data() + (j % d->capacity); - new (p) T(val); - } - - // Adjust the first, last and size indices as needed - d->size += qMin(number, freeCapacity); - d->first = (d->first + numToOverwrite) % d->capacity; - d->last = (d->last + numToInsert) % d->capacity; - } -} - -template <typename T> -int QCircularBuffer<T>::lastIndexOf(const T &val, int from) const -{ - if (from < 0) - from = qMax(from + d->size, 0); - else if (from >= d->size) - from = d->size - 1; - for (int i = from; i >= 0; --i) - if (at(i) == val) - return i; - return -1; -} - -template <typename T> -void QCircularBuffer<T>::prepend(const T &val) -{ - // If we have no capacity we do nothing - if (!d->capacity) - return; - - d.detach(); - if (d->size == d->capacity) { - // Buffer is full. Overwrite last item and rotate - d->data()[ d->last ] = val; - d->first = (--d->first + d->capacity) % d->capacity; - d->last = (--d->last + d->capacity) % d->capacity; - } else if (d->size != 0) { - // Buffer is partially full. Prepend data to start of array using appropriate method - d->first = (--d->first + d->capacity) % d->capacity; - ++d->size; - if (QTypeInfo<T>::isComplex) - new (d->data() + d->first) T(val); - else - d->data()[ d->first ] = val; - } else { - // Buffer is empty. Prepend data to start of array using appropriate method - d->size = 1; - d->first = d->last = d->capacity - 1; - if (QTypeInfo<T>::isComplex) - new (d->data() + d->first) T(val); - else - d->data()[ d->first ] = val; - } -} - -template <typename T> -void QCircularBuffer<T>::remove(int i, int number) -{ - Q_ASSERT_X(i >= 0 && number > 0 && i + number <= d->size, "QCircularBuffer<T>::remove", "index out of range"); - d.detach(); - - // HACK (it actually makes sense, but requires some more thinking) - if ( i == 0 && !QTypeInfo<T>::isComplex ) { - d->first = d->wraparound( d->first + number ); - d->size -= number; - return; - } - - // Calculate the number of items that need to be moved downward - int numToMoveDown = d->size - number - i; - int numToMoveUp = i; - - if (numToMoveDown < numToMoveUp) { - // Move higher items down - int numToMove = numToMoveDown; - - if (QTypeInfo<T>::isComplex) { - // Copy items down from higher positions - int b = d->first + i; - int e = b + numToMove; - for (int j = b; j < e ; ++j) { - T *src = d->data() + ((j + number) % d->capacity); - T *dst = d->data() + (j % d->capacity); - new (dst) T(*src); - } - - // Clean up items at end of buffer - for (int j = d->last; j > d->last - number; --j) { - T *p = d->data() + ((j + d->capacity) % d->capacity); - p->~T(); - //TODO: Optimize to a single memset call - memset(p, 0, sizeof(T)); - } - } else { - if (isLinearised()) { - // With a linearised buffer we can do a simple move and removal of items - memmove(d->data() + d->last - numToMove - number + 1, d->data() + d->last - numToMove + 1, numToMove * sizeof(T)); - memset(d->data() + d->last - number + 1, 0, number * sizeof(T)); - } else { - // With a non-linearised buffer we need to be careful of wrapping issues - int srcBegin = (d->last - numToMove + 1 + d->capacity) % d->capacity; - int srcEnd = d->last; - int dstBegin = (d->first + i) % d->capacity; - int dstEnd = (dstBegin + numToMove - 1) % d->capacity; - - bool srcRegionWraps = (srcEnd < srcBegin); - bool dstRegionWraps = (dstEnd < dstBegin); - if (srcRegionWraps && !dstRegionWraps) { - // Source region wraps so do the move in two steps - int wrapCount = d->capacity - srcBegin; - memmove(d->data() + dstBegin, d->data() + srcBegin, wrapCount * sizeof(T)); - memmove(d->data() + dstBegin + wrapCount, d->data(), (numToMove - wrapCount) * sizeof(T)); - } else if (!srcRegionWraps && dstRegionWraps) { - // Destination region wraps so do the move in two steps - int wrapCount = number - srcBegin; - memmove(d->data() + d->capacity - wrapCount, d->data() + srcBegin, wrapCount * sizeof(T)); - memmove(d->data(), d->data() + srcBegin + wrapCount, (numToMove - wrapCount) * sizeof(T)); - } else if (srcRegionWraps && dstRegionWraps) { - // Source and destination regions wrap so we have to do this in three steps - int srcWrapCount = d->capacity - srcBegin; - memmove(d->data() + dstBegin, d->data() + srcBegin, srcWrapCount * sizeof(T)); - memmove(d->data() + dstBegin + srcWrapCount, d->data(), number * sizeof(T)); - memmove(d->data(), d->data() + number, (numToMove - srcWrapCount - number) * sizeof(T)); - } else { - // No wrap around, so we can do this in one hit - memmove(d->data() + dstBegin, d->data() + srcBegin, numToMove * sizeof(T)); - } - - // We potentially have a disjoint region that needs zeroing - int zeroStart = (d->last - number + d->capacity + 1) % d->capacity; - int zeroEnd = d->last; - if (zeroEnd < zeroStart) { - // Region to be zeroed wraps. Do it in two steps. - memset(d->data(), 0, (d->last + 1) * sizeof(T)); - memset(d->data() + zeroStart, 0, (number - d->last - 1) * sizeof(T)); - } else { - // Region to be zeroed is contiguous - memset(d->data() + zeroStart, 0, number * sizeof(T)); - } - } - } - - // Adjust the indices - d->size -= number; - d->last = (d->last - number + d->capacity) % d->capacity; - } else { - // Move lower items up - int numToMove = numToMoveUp; - - if (QTypeInfo<T>::isComplex) { - // Copy items up from lower positions - int b = d->first + i - 1; - int e = b - numToMove; - for (int j = b; j > e ; --j) { - T *src = d->data() + ((j + d->capacity) % d->capacity); - T *dst = d->data() + ((j + d->capacity + number) % d->capacity); - new (dst) T(*src); - } - - // Clean up items at start of buffer - for (int j = d->first; j < d->first + number; ++j) { - T *p = d->data() + (j % d->capacity); - p->~T(); - //TODO: Optimize to a single memset call - memset(p, 0, sizeof(T)); - } - } else { - if (isLinearised()) { - // With a linearised buffer we can do a simple move and removal of items - memmove(d->data() + d->first + number, d->data() + d->first, numToMove * sizeof(T)); - memset(d->data() + d->first, 0, number * sizeof(T)); - } else { - // With a non-linearised buffer we need to be careful of wrapping issues - int srcBegin = d->first; - int srcEnd = (srcBegin + numToMove - 1) % d->capacity; - int dstBegin = (srcBegin + number) % d->capacity; - int dstEnd = (dstBegin + numToMove - 1) % d->capacity; - - bool srcRegionWraps = (srcEnd < srcBegin); - bool dstRegionWraps = (dstEnd < dstBegin); - if (srcRegionWraps && !dstRegionWraps) { - // Source region wraps so do the move in two steps - int wrapCount = srcEnd + 1; - memmove(d->data() + dstEnd - wrapCount + 1, d->data(), wrapCount * sizeof(T)); - memmove(d->data() + dstBegin, d->data() + srcBegin, (numToMove - wrapCount) * sizeof(T)); - } else if (!srcRegionWraps && dstRegionWraps) { - // Destination region wraps so do the move in two steps - int wrapCount = dstEnd + 1; - memmove(d->data(), d->data() + srcEnd - wrapCount + 1, wrapCount * sizeof(T)); - memmove(d->data() + dstBegin, d->data() + srcBegin, (numToMove - wrapCount) * sizeof(T)); - } else if (srcRegionWraps && dstRegionWraps) { - // Source and destination regions wrap so we have to do this in three steps - int srcWrapCount = srcEnd + 1; - memmove(d->data() + dstEnd - srcWrapCount + 1, d->data(), srcWrapCount * sizeof(T)); - memmove(d->data(), d->data() + d->capacity - number, number * sizeof(T)); - memmove(d->data() + dstBegin, d->data() + srcBegin, (numToMove - srcWrapCount - number) * sizeof(T)); - } else { - // No wrap around, so we can do this in one hit - memmove(d->data() + dstBegin, d->data() + srcBegin, numToMove * sizeof(T)); - } - - // We potentially have a disjoint region that needs zeroing - int zeroStart = d->first; - int zeroEnd = (zeroStart + number - 1) % d->capacity; - if (zeroEnd < zeroStart) { - // Region to be zeroed wraps. Do it in two steps. - memset(d->data() + zeroStart, 0, (d->capacity - d->first) * sizeof(T)); - memset(d->data(), 0, (number - d->capacity + d->first) * sizeof(T)); - } else { - // Region to be zeroed is contiguous - memset(d->data() + zeroStart, 0, number * sizeof(T)); - } - } - } - - // Adjust the indices - d->size -= number; - d->first = (d->first + number) % d->capacity; - } -} - -template <typename T> -void QCircularBuffer<T>::setCapacity(int amount) -{ - if (amount == d->capacity) - return; - - d.detach(); - // Allocate some new raw memory - T *newData = d->allocate(amount); - - // How many items can we copy across? - int newSize = qMin(d->size, amount); - - if (QTypeInfo<T>::isComplex) { - // Copy across the elements from the original array - for (int i = 0; i < newSize; ++i) { - T *src = d->data() + ((d->first + i) % d->capacity); - T *dst = newData + i; - new (dst) T(*src); - } - - // Destroy the original items. - // The type is complex so we manually call the destructor for each item - // since we used the placement new operator to instantiate them - T *b = d->data(); - T *i = b + d->capacity; - while (i-- != b) - i->~T(); - } else { - // Copy across the elements from the original array. The source region - // potentially wraps so we may have to do this in one or two steps - if (isLinearised()) { - memmove(newData, d->data() + d->first, newSize * sizeof(T)); - } else { - int step1Size = qMin(newSize, d->capacity - d->first); - memmove(newData, d->data() + d->first, step1Size * sizeof(T)); - int step2Size = qMax(0, qMin(newSize - d->capacity + d->first, d->last + 1)); - memmove(newData + step1Size, d->data(), step2Size * sizeof(T)); - } - } - - // Initialize any memory outside of the valid buffer (ie the unused items) - memset(newData + newSize, 0, (amount - newSize) * sizeof(T)); - - // Release the raw memory for the old array - d->deallocate(d->data()); - - // Assign the new memory to be our buffer data and fix indices - d->setData(newData); - d->capacity = amount; - d->first = 0; - d->size = newSize; - d->last = d->size - 1; -} - -template <typename T> -void QCircularBuffer<T>::resize(int newSize) -{ - Q_ASSERT_X(newSize >= 0 && newSize <= d->capacity, "QCircularBuffer<T>::resize", "size out of range"); - d.detach(); - if (newSize < d->size) { - remove(newSize, d->size - newSize); - } else if (newSize > d->size) { - const T t = T(); - insert(d->size, newSize - d->size, t); - } -} - -template <typename T> -QCircularBuffer<T> &QCircularBuffer<T>::operator+=(const QCircularBuffer<T> &other) -{ - d.detach(); - // How many items do we need to copy? No point in ever copying across a number - // greater than capacity - int numToCopy = qMin(other.size(), d->capacity); - int offset = other.size() - numToCopy; - for (int i = 0; i < numToCopy; ++i) - append(other.at(offset + i)); - return *this; -} - -template <typename T> -QCircularBuffer<T> &QCircularBuffer<T>::operator+=(const QVector<T> &other) -{ - d.detach(); - // How many items do we need to copy? No point in ever copying across a number - // greater than capacity - int numToCopy = qMin(other.size(), d->capacity); - int offset = other.size() - numToCopy; - for (int i = 0; i < numToCopy; ++i) - append(other.at(offset + i)); - return *this; -} - -template <typename T> -QCircularBuffer<T> &QCircularBuffer<T>::operator+=(const QList<T> &other) -{ - d.detach(); - // How many items do we need to copy? No point in ever copying across a number - // greater than capacity - int numToCopy = qMin(other.size(), d->capacity); - int offset = other.size() - numToCopy; - for (int i = 0; i < numToCopy; ++i) - append(other.at(offset + i)); - return *this; -} - -template <typename T> -QList<T> QCircularBuffer<T>::toList() const -{ - QList<T> list; - list.reserve(size()); - for (int i = 0; i < size(); ++i) - list.append(at(i)); - return list; -} - -template <typename T> -QVector<T> QCircularBuffer<T>::toVector() const -{ - QVector<T> vector; - vector.reserve(size()); - for (int i = 0; i < size(); ++i) - vector.append(at(i)); - return vector; -} - -template <typename T> -QCircularBuffer<T> operator+(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) -{ - QCircularBuffer<T> circ(lhs.size() + rhs.size()); - for (int i = 0; i < lhs.size(); ++i) - circ.append(lhs.at(i)); - for (int i = 0; i < rhs.size(); ++i) - circ.append(rhs.at(i)); - return circ; -} - -#endif // Q_QDOC - -Q_DECLARE_SEQUENTIAL_ITERATOR(CircularBuffer) -Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(CircularBuffer) - -} //Qt3D - -QT_END_NAMESPACE - -#endif // QT3DCORE_QCIRCULARBUFFER_H diff --git a/src/core/resources/qframeallocator.cpp b/src/core/resources/qframeallocator.cpp deleted file mode 100644 index 61a82a2b4..000000000 --- a/src/core/resources/qframeallocator.cpp +++ /dev/null @@ -1,320 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* !\internal - \class Qt3DCore::QFrameAllocator - \inmodule Qt3DCore - \brief Provides a pool of memory chunks to be used to allocate objects on a per frame basis. - - The memory can be recycled by following frames by calling clear which won't deallocate any memory. - - \note Be really careful when allocating polymorphic types. You must be - sure to call deallocate with the subclass type to properly release all - memory. -*/ - -#include "qframeallocator_p.h" -#include "qframeallocator_p_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3DCore { - -QFrameAllocatorPrivate::QFrameAllocatorPrivate() -{ -} - -QFrameAllocator::QFrameAllocator(uint maxObjectSize, uint alignment, uint pageSize) - : d_ptr(new QFrameAllocatorPrivate) -{ - Q_ASSERT(alignment && pageSize && pageSize < UCHAR_MAX); - Q_D(QFrameAllocator); - d->m_maxObjectSize = maxObjectSize; - d->m_alignment = alignment; - d->m_allocatorPool.resize(d->allocatorIndexFromSize(maxObjectSize) + 1); - for (int i = 0, n = d->m_allocatorPool.size(); i < n; ++i) - d->m_allocatorPool[i].init((i + 1) * d->m_alignment, pageSize); -} - -QFrameAllocator::~QFrameAllocator() -{ - Q_D(QFrameAllocator); - for (int i = 0, n = d->m_allocatorPool.size(); i < n; ++i) - d->m_allocatorPool[i].release(); -} - -// Clear all memory chunks, allocated memory is not released -void QFrameAllocator::clear() -{ - Q_D(QFrameAllocator); - for (int i = 0, n = d->m_allocatorPool.size(); i < n; ++i) - d->m_allocatorPool[i].clear(); -} - -// Trim excess memory used by chunks -void QFrameAllocator::trim() -{ - Q_D(QFrameAllocator); - for (int i = 0, n = d->m_allocatorPool.size(); i < n; ++i) - d->m_allocatorPool[i].trim(); -} - -uint QFrameAllocator::maxObjectSize() const -{ - Q_D(const QFrameAllocator); - return d->m_maxObjectSize; -} - -int QFrameAllocator::allocatorPoolSize() const -{ - Q_D(const QFrameAllocator); - return d->m_allocatorPool.size(); -} - -bool QFrameAllocator::isEmpty() const -{ - Q_D(const QFrameAllocator); - for (const QFixedFrameAllocator &allocator : d->m_allocatorPool) { - if (!allocator.isEmpty()) - return false; - } - return true; -} - -uint QFrameAllocator::totalChunkCount() const -{ - Q_D(const QFrameAllocator); - uint chunkCount = 0; - for (const QFixedFrameAllocator& allocator : d->m_allocatorPool) - chunkCount += allocator.chunkCount(); - return chunkCount; -} - -QFixedFrameAllocator::QFixedFrameAllocator() - : m_blockSize(0) - , m_nbrBlock(0) - , m_lastAllocatedChunck(nullptr) - , m_lastFreedChunck(nullptr) -{ -} - -QFixedFrameAllocator::~QFixedFrameAllocator() -{ - release(); -} - -void QFixedFrameAllocator::init(uint blockSize, uchar pageSize) -{ - m_blockSize = blockSize; - m_nbrBlock = pageSize; -} - -void *QFixedFrameAllocator::allocate() -{ - Q_ASSERT(m_blockSize); - return scan().allocate(m_blockSize); -} - -QFrameChunk &QFixedFrameAllocator::scan() -{ - Q_ASSERT(m_blockSize); - Q_ASSERT(m_nbrBlock); - - if (m_lastAllocatedChunck && m_lastAllocatedChunck->m_blocksAvailable) - return *m_lastAllocatedChunck; - - for (int i = 0; i < m_chunks.size(); i++) { - if (m_chunks[i].m_blocksAvailable > 0) { - m_lastAllocatedChunck = m_chunks.begin() + i; - return *m_lastAllocatedChunck; - } - } - m_chunks.resize(m_chunks.size() + 1); - QFrameChunk &newChunk = m_chunks.last(); - newChunk.init(m_blockSize, m_nbrBlock); - m_lastAllocatedChunck = &newChunk; - m_lastFreedChunck = &newChunk; - return newChunk; -} - -void QFixedFrameAllocator::deallocate(void *ptr) -{ - Q_ASSERT(m_blockSize && m_nbrBlock); - if (!m_chunks.empty() && ptr != nullptr) { - if (m_lastFreedChunck != nullptr && m_lastFreedChunck->contains(ptr, m_blockSize)) - m_lastFreedChunck->deallocate(ptr, m_blockSize); - else { - for (int i = 0; i < m_chunks.size(); i++) { - if (m_chunks[i].contains(ptr, m_blockSize)) { - m_chunks[i].deallocate(ptr, m_blockSize); - m_lastFreedChunck = m_chunks.begin() + i; - break ; - } - } - } - } -} - -void QFixedFrameAllocator::trim() -{ - for (int i = m_chunks.size() - 1; i >= 0; i--) { - if (m_chunks.at(i).isEmpty()) { - m_chunks[i].release(); - if (m_lastAllocatedChunck == &m_chunks[i]) - m_lastAllocatedChunck = nullptr; - if (m_lastFreedChunck == &m_chunks[i]) - m_lastFreedChunck = nullptr; - m_chunks.removeAt(i); - } - } -} - -void QFixedFrameAllocator::release() -{ - for (int i = m_chunks.size() - 1; i >= 0; i--) - m_chunks[i].release(); - m_chunks.clear(); - m_lastAllocatedChunck = nullptr; - m_lastFreedChunck = nullptr; -} - -// Allows to reuse chunks without having to reinitialize and reallocate them -void QFixedFrameAllocator::clear() -{ - for (int i = m_chunks.size() - 1; i >= 0; i--) - m_chunks[i].clear(m_blockSize, m_nbrBlock); -} - -bool QFixedFrameAllocator::isEmpty() const -{ - for (const QFrameChunk &chunck : m_chunks) { - if (chunck.m_blocksAvailable != chunck.m_maxBlocksAvailable) - return false; - } - return true; -} - -// QFrameChuck is agnostic about blocksize -// However if it was initialized with a block size of 16 -// You should then pass 16 to allocate and deallocate -void QFrameChunk::init(uint blockSize, uchar blocks) -{ - m_data = new uchar[blockSize * blocks]; - m_firstAvailableBlock = 0; - m_blocksAvailable = blocks; - m_maxBlocksAvailable = blocks; - uchar *p = m_data; - // Init each block with its position stored in its first byte - for (uchar i = 0; i < blocks; p += blockSize) - *p = ++i; -#ifdef QFRAMEALLOCATOR_DEBUG - VALGRIND_CREATE_MEMPOOL(m_data, 0, true); - VALGRIND_MAKE_MEM_NOACCESS(m_data, blockSize * blocks); - VALGRIND_MEMPOOL_ALLOC(m_data, m_data, blockSize * blocks); -#endif -} - -void *QFrameChunk::allocate(uint blockSize) -{ - if (m_blocksAvailable == 0) - return nullptr; - uchar *r = m_data + (m_firstAvailableBlock * blockSize); - m_firstAvailableBlock = *r; - --m_blocksAvailable; - return r; -} - -// Shouldn't be called more than once for the same pointer -void QFrameChunk::deallocate(void *p, uint blockSize) -{ - if (p >= m_data) { - uchar *toRelease = static_cast<uchar *>(p); - uchar oldFreeBlock = m_firstAvailableBlock; - m_firstAvailableBlock = static_cast<uchar>((toRelease - m_data) / blockSize); - *toRelease = oldFreeBlock; - ++m_blocksAvailable; - } -} - -bool QFrameChunk::contains(void *p, uint blockSize) -{ - uchar *c = static_cast<uchar *>(p); - return (m_data <= c && c < m_data + blockSize * m_maxBlocksAvailable); -} - -// Reset chunck without releasing heap allocated memory -void QFrameChunk::clear(uint blockSize, uchar blocks) -{ - m_firstAvailableBlock = 0; - m_blocksAvailable = blocks; - - uchar *p = m_data; - // Init each block with its position stored in its first byte - for (uchar i = 0; i < blocks; p += blockSize) - *p = ++i; -} - -void QFrameChunk::release() -{ -#ifdef QFRAMEALLOCATOR_DEBUG - VALGRIND_MEMPOOL_FREE(m_data, m_data); - VALGRIND_DESTROY_MEMPOOL(m_data); -#endif - delete [] m_data; -} - -void* QFrameAllocator::allocateRawMemory(size_t size) -{ - Q_D(QFrameAllocator); - Q_ASSERT(size <= d->m_maxObjectSize); - uint allocatorIndex = d->allocatorIndexFromSize(uint(size)); - return d->allocateAtChunk(allocatorIndex); -} - -void QFrameAllocator::deallocateRawMemory(void* ptr, size_t size) -{ - Q_D(QFrameAllocator); - Q_ASSERT(size <= d->m_maxObjectSize); - uint allocatorIndex = d->allocatorIndexFromSize(uint(size)); - d->deallocateAtChunck(ptr, allocatorIndex); -} - -} // Qt3D - -QT_END_NAMESPACE diff --git a/src/core/resources/qframeallocator_p.h b/src/core/resources/qframeallocator_p.h deleted file mode 100644 index 4c2b5a961..000000000 --- a/src/core/resources/qframeallocator_p.h +++ /dev/null @@ -1,112 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DCORE_QFRAMEALLOCATOR_P_H -#define QT3DCORE_QFRAMEALLOCATOR_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#ifdef QFRAMEALLOCATOR_DEBUG -#include <valgrind/valgrind.h> -#include <valgrind/memcheck.h> -#endif - -#include <QtCore/QDebug> -#include <QtCore/QScopedPointer> -#include <QtCore/QVector> - -#include <Qt3DCore/private/qt3dcore_global_p.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3DCore { - -class QFrameAllocatorPrivate; - -class Q_3DCORE_PRIVATE_EXPORT QFrameAllocator -{ -public: - explicit QFrameAllocator(uint maxObjectSize, uint alignment = 16, uint pageSize = 128); - ~QFrameAllocator(); - - template<typename T> - T* allocate() - { - void* ptr = allocateRawMemory(sizeof(T)); - new (ptr) T(); // Don't forget to call the constructor of the object using the placement new operator - return static_cast<T*>(ptr); - } - - template<typename T> - void deallocate(T *ptr) - { - ptr->~T(); // Call destructor - deallocateRawMemory(ptr, sizeof(T)); - } - - void* allocateRawMemory(size_t size); - - void deallocateRawMemory(void *ptr, size_t size); - - void clear(); - void trim(); - uint maxObjectSize() const; - uint totalChunkCount() const; - int allocatorPoolSize() const; - bool isEmpty() const; - -private: - Q_DECLARE_PRIVATE(QFrameAllocator) - const QScopedPointer<QFrameAllocatorPrivate> d_ptr; -}; - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QFRAMEALLOCATOR_P_H diff --git a/src/core/resources/qframeallocator_p_p.h b/src/core/resources/qframeallocator_p_p.h deleted file mode 100644 index bf4e0a2b1..000000000 --- a/src/core/resources/qframeallocator_p_p.h +++ /dev/null @@ -1,138 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DCORE_QFRAMEALLOCATOR_P_P_H -#define QT3DCORE_QFRAMEALLOCATOR_P_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <Qt3DCore/qt3dcore_global.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3DCore { - -class QFrameAllocator; - -struct Q_AUTOTEST_EXPORT QFrameChunk -{ - void init(uint blockSize, uchar blocks); - void *allocate(uint blockSize); - - void deallocate(void *p, uint blockSize); - bool contains(void *p, uint blockSize); - void clear(uint blockSize, uchar blocks); - void release(); - - inline bool isEmpty() const { return m_blocksAvailable == m_maxBlocksAvailable; } - - uchar *m_data; - uchar m_firstAvailableBlock; - uchar m_blocksAvailable; - uchar m_maxBlocksAvailable; -}; - -class Q_AUTOTEST_EXPORT QFixedFrameAllocator -{ -public: - QFixedFrameAllocator(); - ~QFixedFrameAllocator(); - - void init(uint blockSize, uchar pageSize = 128); - void *allocate(); - void deallocate(void *ptr); - void trim(); - void release(); - void clear(); - bool isEmpty() const; - - inline int chunkCount() const { return m_chunks.size(); } - inline uchar pageSize() const { return m_nbrBlock; } - inline uint blockSize() const { return m_blockSize; } - -private: - QFrameChunk &scan(); - -private: - uint m_blockSize; - uchar m_nbrBlock; - QVector<QFrameChunk> m_chunks; - QFrameChunk *m_lastAllocatedChunck; - QFrameChunk *m_lastFreedChunck; -}; - -class QFrameAllocatorPrivate -{ -public: - QFrameAllocatorPrivate(); - - inline void *allocateAtChunk(uint allocatorIndex) - { - return m_allocatorPool[allocatorIndex].allocate(); - } - - inline void deallocateAtChunck(void *ptr, uint allocatorIndex) - { - m_allocatorPool[allocatorIndex].deallocate(ptr); - } - - inline uint allocatorIndexFromSize(uint targetSize) const - { - return (targetSize + m_alignment - 1) / m_alignment - 1; - } - - uint m_maxObjectSize; - uint m_alignment; - QVector<QFixedFrameAllocator> m_allocatorPool; -}; - -} // Qt3D - -QT_END_NAMESPACE - -#endif // QT3DCORE_QFRAMEALLOCATOR_P_P_H diff --git a/src/core/resources/resources.pri b/src/core/resources/resources.pri index 7f3ce4bdc..e9563f935 100644 --- a/src/core/resources/resources.pri +++ b/src/core/resources/resources.pri @@ -1,14 +1,9 @@ HEADERS += \ $$PWD/qresourcemanager_p.h \ - $$PWD/qcircularbuffer_p.h \ - $$PWD/qboundedcircularbuffer_p.h \ - $$PWD/qframeallocator_p.h \ - $$PWD/qframeallocator_p_p.h \ $$PWD/qhandle_p.h SOURCES += \ - $$PWD/qresourcemanager.cpp \ - $$PWD/qframeallocator.cpp + $$PWD/qresourcemanager.cpp # Define proper SIMD flags for qresourcemanager.cpp diff --git a/src/doc/src/qcircularbuffer.qdoc b/src/doc/src/qcircularbuffer.qdoc deleted file mode 100644 index 90d307a04..000000000 --- a/src/doc/src/qcircularbuffer.qdoc +++ /dev/null @@ -1,1578 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* !\internal - \class Qt3DCore::QCircularBuffer - \inmodule Qt3DCore - \brief A template class providing a dynamic circular array. - - \ingroup tools - \ingroup shared - - \reentrant - - QCircularBuffer\<T\> is one of Qt's generic \l{container classes}. It - stores its items in adjacent memory locations and provides fast - index-based access. - - QCircularBuffer\<T\> provides similar functionality as QVector\<T\> and QList\<T\>, - but behaves differently when adding items to a full QCircularBuffer. Whereas - QVector\<T\> and QList\<T\> will both grow to accommodate the new items, - QCircularBuffer\<T\> will overwrite the oldest items. This provides circular - behavior to the container, and also means that it can maintain a flat memory - profile. - - QCircularBuffer\<T\> also offers performance gains over the other container classes when - doing lots of appending or prepending to the buffer, such as in data logging - applications. This is because appending (or prepending) an item does not require any - extra memory to be allocated, unlike, for example, QVector\<T\> or QList\<T\>. - Appending and prepending items to a QCircularBuffer\<T\> is an O(1) operation. - - As with QVector\<T\>, items in QCircularBuffer\<T\> occupy adjacent positions in memory. - However, the items may not be located in order in a single array. At times, the internal - indices used to store the positions of the first and last items may wrap around as the - QCircularBuffer\<T\> is modified. If the index of the last item is greater than the - index of the first item, then the buffer is said to be non-linearized. - - Here's an example of a QCircularBuffer that stores integers and a QCircularBuffer - that stores QString values: - - \snippet code/src_core_qcircularbuffer.cpp 0 - - The above examples create QCircularBuffer objects with a capacity of 0. The capacity - is the number of items that can be stored in a QCircularBuffer. The size of a - QCircularBuffer object is the number of items that actually are stored in it. Here's - an example of creating a QCircularBuffer with a capacity for 200 elements and a size of 0: - - \snippet code/src_core_qcircularbuffer.cpp 1 - - By default the QCircularBuffer is empty. If you want to create a circular buffer with - unused capacity, pass a size argument to the constructor. - - \snippet code/src_core_qcircularbuffer.cpp 2 - - If you wish to fill a subset of the QCircularBuffer with a default value, then you - should also pass a size argument to the constructor. The following example creates - a QCircularBuffer with a capacity for 200 QString items, and initializes the first 50 - of them to the value "Qt": - - \snippet code/src_core_qcircularbuffer.cpp 3 - - You can also call fill() at any time to fill the QCircularBuffer with a value. - - QCircularBuffer uses 0-based indexes, just like C++ arrays. To access the - item at a particular index position, you can use \l{operator[]()}{operator[]}. On - non-const buffers, \l{operator[]()}{operator[]} returns a reference to the item - that can be used on the left side of an assignment: - - \snippet code/src_core_qcircularbuffer.cpp 4 - - For read-only access, an alternative syntax is to use at(): - - \snippet code/src_core_qcircularbuffer.cpp 5 - - at() can be faster than \l{operator[]()}{operator[]}, because it never causes - a \l{deep copy} to occur. - - Another way to access the data stored in a QCircularBuffer is to call data(), - or dataOne() and dataTwo() depending on if the buffer is linearized or not. - See the discussion in isLinearised() for more information. The data() function - returns an \l array_range object describing the array of items stored - in the QCircularBuffer. You can use the pointer in the array_range to - directly access and modify the elements stored in the circular buffer. The pointer is also - useful if you need to pass a QCircularBuffer to a function that accepts a plain - C++ array. - - If the circular buffer is non-linearized, the data() function will - linearize it before returning. This can be an expensive operation for large buffers. - To avoid this cost, QCircularBuffer also provides alternative methods called - dataOne() and dataTwo() that return pointers to the two contiguous arrays used - to represent the buffer. dataOne() returns a pointer to the earlier (or oldest) - items, and dataTwo() returns a pointer to the later (or newer) items. The dataOne() - and dataTwo() functions never cause the circular buffer to be linearized. - - If you wish to pass a C++ array to a function and that function is expensive to call, - then you may wish to use the data() method so that you only need to call your - expensive function once. If your function is cheap and you have a large circular - buffer (so that linearizing it is expensive), then you may wish to use dataOne() and - dataTwo() and call your function twice. - - Here is a simple example that shows the semantics of how QCircularBuffer operates: - - \snippet code/src_core_qcircularbuffer.cpp 6 - - Notice how appending items to a full buffer overwrites the earliest items. - - If you want to find all occurrences of a particular value in a - circular buffer, use indexOf() or lastIndexOf(). The former searches - forward starting from a given index position, the latter searches - backward. Both return the index of the matching item if they found - one; otherwise, they return -1. For example: - - \snippet code/src_core_qcircularbuffer.cpp 7 - - If you simply want to check whether a circular buffer contains a - particular value, use contains(). If you want to find out how - many times a particular value occurs in the circular buffer, use count(). - - QCircularBuffer provides these basic functions to add, move, and remove - items: insert(), replace(), remove(), prepend(), append(). The insert() and - remove() functions can be slow (\l{linear time}) for large circular buffers, - because they require moving many items in the circular buffer by one or more positions - in memory. The implementation does however take care to minimize the number of - items that need to be moved. In the extreme worst case for insert() and remove(), - half of the items will be moved in memory. QCircularBuffer also takes care - to move items around using the best method available for the type being stored. - If your type is movable, then it is best to tell Qt about this by using the - Q_DECLARE_TYPEINFO() macro. In such cases memory moves are performed using - memmove() rather than calling the copy constructor for each item. If you want - a container class that always provides fast insertion/removal in the middle, - use QList or QLinkedList instead. - - Unlike plain C++ arrays, QCircularBuffers can be resized at any time by - calling resize() or setCapacity(). The resize() function can only allocate - items up to the number specified by capacity(). If you wish to alter the - capacity of the CircularBuffer, then use setCapacity(). This can be slow as - new memory needs to be allocated. It is most common to specify the capacity - of the circular buffer in the constructor or immediately after construction, - and then simply keep appending to the buffer. If you wish to reclaim any - unused memory from the circular buffer, then call squeeze(). This is - equivalent to calling \l {setCapacity()}{setCapacity}( size() ). - - Note that using non-const operators and functions can cause - QCircularBuffer to do a deep copy of the data. This is due to - \l{implicit sharing}. - - QCircularBuffer's value type must be an \l{assignable data type}. This - covers most data types that are commonly used, but the compiler - won't let you, for example, store a QWidget as a value; instead, - store a QWidget *. Some functions have additional requirements; - for example, indexOf() and lastIndexOf() expect the value type to - support \c operator==(). These requirements are documented on a - per-function basis. - - QCircularBuffer provides \l{STL-Style Iterators} (\l {const_iterator} - and \l {iterator}). In practice, these are rarely used, - because you can use indexes into the buffer. - - QCircularBuffer does \e not support inserting, prepending, appending, or - replacing with references to its own values. Doing so will cause your - application to abort with an error message. - - \sa iterator, const_iterator, QVector, QList, QLinkedList -*/ - -/* \fn Qt3DCore::QCircularBuffer::QCircularBuffer() - - Constructs an empty circular buffer with zero capacity. - - \sa resize(), setCapacity() -*/ - -/* \fn Qt3DCore::QCircularBuffer::QCircularBuffer(int capacity) - - Constructs an empty circular buffer with an initial capacity of \a capacity - elements. - - \sa resize(), setCapacity() -*/ - -/* \fn Qt3DCore::QCircularBuffer::QCircularBuffer(int capacity, const T &value) - - Constructs a circular buffer with an initial capacity and size of - \a capacity elements. - - The elements are initialized to \a value. - - \sa resize(), setCapacity(), fill() -*/ - -/* \fn Qt3DCore::QCircularBuffer::QCircularBuffer(int capacity, int size, const T &value) - - Constructs a circular buffer with an initial capacity of \a capacity - elements and initial size of \a size elements. - - The first \a size elements are initialized to \a value. - - \sa resize(), setCapacity(), fill() -*/ - -/* \fn Qt3DCore::QCircularBuffer::QCircularBuffer(const QCircularBuffer<T> &other) - - Constructs a copy of \a other. - - This operation takes \l{constant time}, because QCircularBuffer is - \l{implicitly shared}. This makes returning a QCircularBuffer from a - function very fast. If a shared instance is modified, it will be - copied (copy-on-write), and that takes \l{linear time}. - - \sa operator=() -*/ - -/* \fn Qt3DCore::QCircularBuffer::~QCircularBuffer() - - Destroys the circular buffer. -*/ - -/* \fn QCircularBuffer &Qt3DCore::QCircularBuffer::operator=(const QCircularBuffer<T> &other) - - Assigns \a other to this circular buffer and returns a reference to this - circular buffer. -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator Qt3DCore::QCircularBuffer::begin() - - Returns an \l{STL-Style iterators}{STL-style iterator} pointing to the first item in - the circular buffer. - - \sa constBegin(), end() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator Qt3DCore::QCircularBuffer::begin() const - - \overload -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator Qt3DCore::QCircularBuffer::constBegin() const - - Returns a const \l{STL-Style Iterators}{STL-style iterator} pointing to the first item in - the circular buffer. - - \sa begin(), constEnd() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator Qt3DCore::QCircularBuffer::end() - - Returns an \l {STL-Style Iterators} {STL-style iterator} pointing to the imaginary item - after the last item in the circular buffer. - - \sa begin(), constEnd() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator Qt3DCore::QCircularBuffer::end() const - - \overload -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator Qt3DCore::QCircularBuffer::constEnd() const - - Returns a const \l{STL-Style Iterators} {STL-style iterator} pointing to the imaginary item - after the last item in the circular buffer. - - \sa constBegin(), end() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator Qt3DCore::QCircularBuffer::erase(const_iterator pos) - - Removes the item pointed to by the iterator \a pos from the - circular buffer, and returns an iterator to the next item in the circular - buffer (which may be end()). - - \sa insert(), remove() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator Qt3DCore::QCircularBuffer::erase(const_iterator begin, const_iterator end) - - \overload - - Removes all the items from \a begin up to (but not including) \a - end. Returns an iterator to the same item that \a end referred to - before the call. -*/ - -/* \fn void Qt3DCore::QCircularBuffer::push_back(const T &value) - - This function is provided for STL compatibility. It is equivalent - to append(\a value). -*/ - -/* \fn void Qt3DCore::QCircularBuffer::push_front(const T &value) - - This function is provided for STL compatibility. It is equivalent - to prepend(\a value). -*/ - -/* \fn void Qt3DCore::QCircularBuffer::pop_back() - - This function is provided for STL compatibility. It is equivalent - to erase(end() - 1). -*/ - -/* \fn void Qt3DCore::QCircularBuffer::pop_front() - - This function is provided for STL compatibility. It is equivalent - to erase(begin()). -*/ - -/* \fn bool Qt3DCore::QCircularBuffer::empty() const - - This function is provided for STL compatibility. It is equivalent - to isEmpty(), returning true if the circular buffer is empty; otherwise - returns false. -*/ - -/* \fn Qt3DCore::QCircularBuffer::reference Qt3DCore::QCircularBuffer::front() - - This function is provided for STL compatibility. It is equivalent - to first(). -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_reference Qt3DCore::QCircularBuffer::front() const - - \overload -*/ - -/* \fn Qt3DCore::QCircularBuffer::reference Qt3DCore::QCircularBuffer::back() - - This function is provided for STL compatibility. It is equivalent - to last(). -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_reference Qt3DCore::QCircularBuffer::back() const - - \overload -*/ - -/* \fn int Qt3DCore::QCircularBuffer::refCount() const - - Returns the number of shallow copies that exist of this circular buffer. -*/ - -/* \fn Qt3DCore::QCircularBuffer::append(const T &value) - - Inserts \a value at the end of the circular buffer. If the circular buffer - is full, then the oldest element is overwritten. - - Example: - \snippet code/src_core_qcircularbuffer.cpp 8 - - This operation is very fast, because QCircularBuffer never allocates - memory in this function. - - \sa operator<<(), operator+=(), prepend(), insert() -*/ - -/* \fn const T &Qt3DCore::QCircularBuffer::at(int i) const - - Returns the item at index position \a i in the circular buffer. - - \a i must be a valid index position in the circular buffer - (i.e., 0 <= \a i < size()). - - \sa value(), operator[]() -*/ - -/* \fn T &Qt3DCore::QCircularBuffer::operator[](int i) - - Returns the item at index position \a i as a modifiable reference. - - \a i must be a valid index position in the circular buffer (i.e., 0 <= \a i - < size()). - - Note that using non-const operators can cause QCircularBuffer to do a deep - copy. - - \sa at(), value() -*/ - -/* \fn const T &Qt3DCore::QCircularBuffer::operator[](int i) const - - \overload - - Same as at(\a i). -*/ - -/* \fn int Qt3DCore::QCircularBuffer::capacity() const - - Returns the maximum number of elements that can be stored in - the circular buffer. - - \sa setCapacity(), size() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::clear() - - Removes all elements from the circular buffer so that the size is - zero. The capacity is unchanged. - - \sa isEmpty() -*/ - -/* \fn bool Qt3DCore::QCircularBuffer::contains(const T &value) const - - Returns true if the circular buffer contains an occurrence of \a value; - otherwise returns false. - - This function requires the value type to have an implementation of - \c operator==(). - - \sa indexOf(), count() -*/ - -/* \fn int Qt3DCore::QCircularBuffer::count(const T &value) const - - Returns the number of occurrences of \a value in the circular buffer. - - This function requires the value type to have an implementation of - \c operator==(). - - \sa contains(), indexOf() -*/ - -/* \fn int Qt3DCore::QCircularBuffer::count() const - - \overload - - Same as size(). -*/ - -/* \fn Qt3DCore::QCircularBuffer::array_range Qt3DCore::QCircularBuffer::data() - - Returns an \l array_range describing the internal array of data. If - the circular buffer is non-linearized, then this function causes it to be - linearized. If the cost of linearisation is too high for your use case, then - you should consider using the dataOne() and dataTwo() functions instead. - - If the circular buffer is empty then the pointer and array size returned - will both be 0. - - \sa constData(), dataOne(), dataTwo(), isLinearised() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_array_range Qt3DCore::QCircularBuffer::data() const - - \overload - - If the circular buffer is non-linearized then the pointer and array size - returned will both be 0 since linearising the circular buffer would break - constness. -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_array_range Qt3DCore::QCircularBuffer::constData() const - - Returns a \l const_array_range describing the internal array of - data. - - If the circular buffer is non-linearized then the pointer and array size - returned will both be 0 since linearising the circular buffer would break - constness. - - If the circular buffer is empty then the pointer and array size returned - will both be 0. - - \sa data(), constDataOne(), constDataTwo(), isLinearised() -*/ - -/* \fn Qt3DCore::QCircularBuffer::array_range Qt3DCore::QCircularBuffer::dataOne() - - Returns an \l array_range describing the first internal array of - contiguous data. If the circular buffer is linearized, then this function is - equivalent to calling data(). If the circular buffer is non-linearized then - the returned array range will describe a subset of the data contained in the - circular buffer. This subset will consist of the earliest (lowest index) items - in the buffer. To obtain an \l array_range for the remainder of the data, use - the dataTwo() function. - - If the circular buffer is empty, then the pointer and array size returned - will both be 0. - - \sa constDataOne(), dataTwo(), data(), isLinearised() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_array_range Qt3DCore::QCircularBuffer::dataOne() const - - \overload - - Unlike data(), this function always returns a valid \l const_array_range - (unless the circular buffer is empty). -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_array_range Qt3DCore::QCircularBuffer::constDataOne() const - - Returns a \l const_array_range describing the first internal array of - contiguous data. If the circular buffer is linearized, then this function is - equivalent to calling constData(). If the circular buffer is non-linearized, then - the returned array range will describe a subset of the data contained in the - circular buffer. This subset will consist of the earliest (lowest index) items - in the buffer. To obtain a \l const_array_range for the remainder of the data, - use the constDataTwo() function. - - If the circular buffer is empty, then the pointer and array size returned - will both be 0. - - \sa dataOne(), constDataTwo(), constData(), isLinearised() -*/ - -/* \fn Qt3DCore::QCircularBuffer::array_range Qt3DCore::QCircularBuffer::dataTwo() - - Returns an \l array_range describing the first internal array of - contiguous data. If the circular buffer is linearized, then the pointer and array size - returned will both be 0 since all the data will be contained in the array - described by calling the dataOne() function. - - \sa dataOne(), constDataTwo(), data(), isLinearised() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_array_range Qt3DCore::QCircularBuffer::dataTwo() const - - \overload -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_array_range Qt3DCore::QCircularBuffer::constDataTwo() const - - Returns a \l const_array_range describing the first internal array of - contiguous data. If the circular buffer is linearized, then the pointer and array size - returned will both be 0 since all the data will be contained in the array - described by calling the dataOne() function. - - \sa constDataOne(), dataTwo(), constData(), isLinearised() -*/ - -/* \fn bool Qt3DCore::QCircularBuffer::endsWith(const T &value) const - - Returns \c true if this circular buffer is not empty and its last - item is equal to \a value; otherwise returns \c false. - - \sa isEmpty(), last(), startsWith() -*/ - -/* \fn QCircularBuffer<T>& Qt3DCore::QCircularBuffer::fill(const T &value, int size = -1) - - Assigns \a value to all items in the circular buffer. If \a size is - different from -1 (the default), the circular buffer is resized to size \a - size beforehand (size must be less than or equal to the capacity). - - This function also linearizes the circular buffer. - - Example: - \snippet code/src_core_qcircularbuffer.cpp 14 - - \sa resize() -*/ - -/* \fn T &Qt3DCore::QCircularBuffer::first() - - Returns a reference to the first item in the circular buffer. This - function assumes that the circular buffer isn't empty. - - \sa last(), isEmpty() -*/ - -/* \fn const T &Qt3DCore::QCircularBuffer::first() const - - \overload -*/ - -/* \fn int Qt3DCore::QCircularBuffer::freeSize() const - - Returns the number of items that can be added to the circular buffer - without causing the earliest item to be overwritten. It is equivalent - to (capacity() - size()). - - \sa sizeAvailable(), capacity(), isEmpty(), isFull(), size() -*/ - -/* \fn static QCircularBuffer<T> Qt3DCore::QCircularBuffer::fromList(const QList<T>& list) - - Returns a QCircularBuffer object with the data contained in \a list. The - capacity and size of the circular buffer will be equal to the size of - \a list. - - Example: - \snippet code/src_core_qcircularbuffer.cpp 18 - - \sa fromVector(), toList(), toVector() -*/ - -/* \fn static QCircularBuffer<T> Qt3DCore::QCircularBuffer::fromVector(const QVector<T>& vector) - - Returns a QCircularBuffer object with the data contained in \a vector. The - capacity and size of the circular buffer will be equal to the size of - \a vector. - - \sa fromList(), toVector(), toList() -*/ - -/* \fn int Qt3DCore::QCircularBuffer::indexOf(const T &value, int from = 0) const - - Returns the index position of the first occurrence of \a value in - the circular buffer, searching forward from index position \a from. - Returns -1 if no item matched. - - Example: - \snippet code/src_core_qcircularbuffer.cpp 15 - - This function requires the value type to have an implementation of - \c operator==(). - - \sa lastIndexOf(), contains() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::insert(int i, const T &value) - - Inserts \a value at index position \a i in the circular buffer. - If \a i is 0, the value is prepended to the circular buffer. If \a i - is size(), the value is appended to the circular buffer. The capacity - of the circular buffer is not changed. - - Example: - \snippet code/src_core_qcircularbuffer.cpp 11 - - Using this function is equivalent to calling insert(i, 1, value). See the - discussion there for more information. - - Items at indexes \a i and higher are shifted along by one. If the circular - buffer is full then the earliest item will be overwritten. Note that this - has the non-obvious behavior that calling \c {insert(0, value)} on a circular - buffer that is already full will effectively do nothing since the newly - prepended item will immediately be overwritten by the highest item as it - is shifted along one position. - - For large circular buffers, this operation can be slow (\l{linear time}), - because it requires moving all the items at indexes \a i and - above (or all items below index i depending upon where in the circular buffer - the new item is inserted) by one position in memory. If you - want a container class that provides a fast insert() function, use - QLinkedList instead. - - If the capacity() is zero, then nothing will be inserted. - - \sa append(), prepend(), remove() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::insert(int i, int count, const T &value) - - \overload - - Inserts \a value at index position \a i in the circular buffer. - If \a i is 0, the value is prepended to the circular buffer. If \a i - is size(), the value is appended to the circular buffer. The capacity - of the circular buffer is not changed. - - Items at indexes \a i and higher are shifted along by one. If the circular - buffer has freeSize() < \a count, then the earliest items will be overwritten. - - The actual number of items that get inserted may not always be equal to - \a count since this function preserves the capacity of the circular buffer, - and since items at indexes i and higher are shifted along by one. - The actual number of items inserted is min(\a count, \a i + freeSize()). - - For the same reasons, the number of items that get overwritten at the - start of the circular buffer is min(\a i, max(0, \a count - freeSize())). - - Example: - \snippet code/src_core_qcircularbuffer.cpp 12 - - For large circular buffers, this operation can be slow (\l{linear time}), - because it requires moving all the items at indexes \a i and - above (or all items below index i depending upon where in the circular buffer - the new item is inserted) in memory. If you want a container class that - provides a fast insert() function, use QLinkedList instead. - - If the capacity() is zero, then nothing will be inserted. - - \sa append(), prepend(), remove() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator Qt3DCore::QCircularBuffer::insert(const_iterator before, int count, const T &value) - - \overload - - Inserts up to \a count items with value \a value in front of the item - pointed to by the iterator \a before in the circular buffer. Returns an - iterator pointing at the first of the inserted items. - - \sa append(), prepend(), remove() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator Qt3DCore::QCircularBuffer::insert(const_iterator before, const T &value) - - \overload - - Inserts \a value in front of the item pointed to by the iterator \a before. - Returns an iterator pointing at the inserted item. - - \sa append(), prepend(), remove() -*/ - -/* \fn bool Qt3DCore::QCircularBuffer::isEmpty() const - - Returns true if the circular buffer has size 0; otherwise returns false. - - \sa capacity(), resize(), setCapacity(), size() -*/ - -/* \fn bool Qt3DCore::QCircularBuffer::isFull() const - - Returns true if the circular buffer is full ie if size() == capacity(); otherwise returns false. - - \sa capacity(), resize(), setCapacity(), size() -*/ - -/* \fn bool Qt3DCore::QCircularBuffer::isLinearised() const - - Returns \c true if the circular buffer is linearized; otherwise returns - \c false. - - A circular buffer is said to be linearized if the position of the first - item in the internal array occurs before the position of the last item. A - little more explanation is provided for clarification. - - Internally, QCircularBuffer stores the items in a plain C++ array. - Additionally, the positions in the array of the first and last items of - the circular buffer are also stored (along with the capacity and size). - - Imagine a circular buffer of capacity 6 created and populated with the - following code: - - \snippet code/src_core_qcircularbuffer.cpp 19 - - After executing the above code, the internal state of the circular buffer - would look like this: - - \img circularbuffer-1.png - - As you can see, the internal array has been populated from the beginning. - The first item is located as position 0 in the array and the last item - is located at position 4 in the array. The circular buffer is linearized - because the last item occurs later in the array than the first item. - - If we now append another item to the circular buffer with: - - \snippet code/src_core_qcircularbuffer.cpp 20 - - the internal representation then becomes: - - \img circularbuffer-2.png - - The circular buffer is still linearized, but it is now full. Appending - further items will cause the oldest item to be overwritten. For example, - - \snippet code/src_core_qcircularbuffer.cpp 21 - - causes the internal representation to become: - - \img circularbuffer-3.png - - We see that the oldest item (1) has been overwritten by the newest item - (7), and that the first and last indexes have been adjusted accordingly. - The circular buffer is now said to be non-linearized because the position - of the last item is before the position of the first item. - - The circular buffer can always be linearized by calling the linearise() - function. This can be an expensive operation (\l{linear time}) for large - circular buffers since new memory has to be allocated, the items copied across, - and the original memory deallocated. - - If you need to directly access the items stored in a circular buffer, - (perhaps for a plain C++ function call) then you can use the data() - function. If the circular buffer is non-linearized, then the data() - function will linearize it for you before returning an \l array_range - describing the array. - - To prevent the cost of the linearisation process, you can instead - call the dataOne() and dataTwo() functions to obtain the two arrays - used to represent a non-linearized circular buffer. After running the - above sample code, calling the dataOne() function would return an - \l array_range object describing the values 2-6, and the dataTwo() function - would return an \l array_range object describing the value 7. Sometimes, - accessing the items via the two arrays described by dataOne() and dataTwo(), - can be quicker than calling data() and having the circular buffer - linearized. The dataOne() and dataTwo() functions do not trigger a - linearization. - - \sa linearise(), data(), dataOne(), dataTwo() -*/ - -/* \fn T &Qt3DCore::QCircularBuffer::last() - - Returns a reference to the last item in the circular buffer. This - function assumes that the circular buffer isn't empty. - - \sa first(), isEmpty() -*/ - -/* \fn const T &Qt3DCore::QCircularBuffer::last() const - - \overload -*/ - -/* \fn int Qt3DCore::QCircularBuffer::lastIndexOf(const T &value, int from = -1) const - - Returns the index position of the last occurrence of the value \a - value in the circular buffer, searching backward from index position \a - from. If \a from is -1 (the default), the search starts at the - last item. Returns -1 if no item is matched. - - Example: - \snippet code/src_core_qcircularbuffer.cpp 16 - - This function requires the value type to have an implementation of - \c operator==(). - - \sa indexOf() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::linearise() - - Linearizes the internal representation of the circular buffer such that - all items are stored in a single contiguous array. - - This function can be expensive for large circular buffers (\l{linear time}). - - \sa isLinearised() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::prepend(const T &value) - - Inserts \a value at the beginning of the circular buffer. If the circular buffer - is full, then the highest index item is overwritten. - - Example: - \snippet code/src_core_qcircularbuffer.cpp 10 - - This operation is very fast, because QCircularBuffer never allocates - memory in this function. - - \sa operator<<(), operator+=(), append(), insert() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::remove(int i) - - Removes the element at index position \a i. - - \sa insert(), replace(), fill() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::remove(int i, int count) - - \overload - - Removes \a count elements from the middle of the circular buffer, - starting at index position \a i. - - \sa insert(), replace(), fill() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::replace(int i, const T &value) - - Replaces the item at index position \a i with \a value. - - \a i must be a valid index position in the circular buffer (i.e., 0 <= \a - i < size()). - - \sa operator[](), remove() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::reserve(int capacity) - - Sets the capacity of the circular buffer to \a capacity. It is a synonym for - setCapacity(). - - \sa setCapacity() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::resize(int size) - - Changes the size of the circular buffer to \a size which must be > 0 and - <= capacity(). If \a size is less than the old size, then the highest indexed - items are removed. If \a size is greater than the old size, then new items - with a \l{default-constructed value} are appended to the end of the circular - buffer. - - \sa size(), insert(), remove(), capacity(), setCapacity() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::setCapacity(int capacity) - - Sets the capacity of the circular buffer to \a capacity. - - \sa reserve(), capacity() -*/ - -/* \fn int Qt3DCore::QCircularBuffer::size() const - - Returns the number of items in the circular buffer. - - \sa sizeAvailable(), capacity(), resize() -*/ - -/* \fn int Qt3DCore::QCircularBuffer::sizeAvailable() const - - Returns the number of items that can be added to the circular buffer - without causing the earliest item to be overwritten. It is equivalent - to (capacity() - size()). - - \sa capacity(), isEmpty(), isFull(), size(), freeSize() -*/ - -/* \fn void Qt3DCore::QCircularBuffer::squeeze() - - Releases any unused memory from the circular buffer. It is equivalent - to calling setCapacity(size()). - - \sa setCapacity(), size(), resize(), sizeAvailable() -*/ - -/* \fn bool Qt3DCore::QCircularBuffer::startsWith(const T &value) const - - Returns \c true if the circular buffer is not empty and its first - item is equal to \a value; otherwise returns \c false. - - \sa isEmpty(), first(), endsWith() -*/ - -/* \fn QList<T> Qt3DCore::QCircularBuffer::toList() const - - Returns a QList object with the data contained in this QCircularBuffer. - - Example: - - \snippet code/src_core_qcircularbuffer.cpp 17 - - \sa fromList(), toVector() -*/ - -/* \fn QVector<T> Qt3DCore::QCircularBuffer::toVector() const - - Returns a QVector object with the data contained in this QCircularBuffer. - - \sa fromVector(), toList() -*/ - -/* \fn T Qt3DCore::QCircularBuffer::value(int i) const - - Returns the value at index position \a i in the circular buffer. - - If the index \a i is out of bounds, the function returns - a \l{default-constructed value}. If you are certain that - \a i is within bounds, you can use at() instead, which is slightly - faster. - - \sa at(), operator[]() -*/ - -/* \fn T Qt3DCore::QCircularBuffer::value(int i, const T &defaultValue) const - - \overload - - If the index \a i is out of bounds, the function returns - \a defaultValue. -*/ - -/* \fn bool Qt3DCore::operator==(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) - - Returns \c true if the circular buffer \a lhs is equal to \a rhs; otherwise - returns \c false. - - Two circular buffers are considered equal if they contain the same values - in the same order and have the same capacity. - - This function requires the value type to have an implementation - of \c operator==(). - - \sa operator!=() -*/ - -/* \fn bool Qt3DCore::operator!=(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) - - Returns \c true if the circular buffer \a lhs is not equal to \a rhs; otherwise - returns \c false. - - Two circular buffers are considered equal if they contain the same values - in the same order and have the same capacity. - - This function requires the value type to have an implementation - of \c operator==(). - - \sa operator==() -*/ - -/* \fn Qt3DCore::QCircularBuffer<T>& Qt3DCore::QCircularBuffer::operator+=(const T &other) - - Appends the item \a other to this circular buffer and returns a - reference to this circular buffer. - - \sa operator+(), operator<<(), append() -*/ - -/* \fn Qt3DCore::QCircularBuffer<T>& Qt3DCore::QCircularBuffer::operator+=(const QCircularBuffer<T>& other) - - \overload - - Appends the items of the \a other circular buffer to this circular - buffer and returns a reference to this circular buffer. - - \sa operator+(), operator<<(), append() -*/ - -/* \fn Qt3DCore::QCircularBuffer<T>& Qt3DCore::QCircularBuffer::operator+=(const QVector<T>& other) - - \overload -*/ - -/* \fn Qt3DCore::QCircularBuffer<T>& Qt3DCore::QCircularBuffer::operator+=(const QList<T>& other) - - \overload -*/ - -/* \fn Qt3DCore::QCircularBuffer<T>& Qt3DCore::QCircularBuffer::operator<<(const T &other) - - Appends the item \a other to this circular buffer and returns a - reference to this circular buffer. - - \sa operator+(), operator+=(), append() -*/ - -/* \fn Qt3DCore::QCircularBuffer<T>& Qt3DCore::QCircularBuffer::operator<<(const QCircularBuffer<T>& other) - - \overload - - Appends the items of the \a other circular buffer to this circular - buffer and returns a reference to this circular buffer. - - \sa operator+(), operator+=(), append() -*/ - -/* \fn Qt3DCore::QCircularBuffer<T>& Qt3DCore::QCircularBuffer::operator<<(const QVector<T>& other) - - \overload -*/ - -/* \fn Qt3DCore::QCircularBuffer<T>& Qt3DCore::QCircularBuffer::operator<<(const QList<T>& other) - - \overload -*/ - -/* \fn Qt3DCore::QCircularBuffer<T> Qt3DCore::operator+(const QCircularBuffer<T>& lhs, const QCircularBuffer<T>& rhs) - \relates Qt3DCore::QCircularBuffer - - Returns a circular buffer object with capacity of lhs.size() + rhs.size() containing - the items from \a lhs followed by the items from \a rhs. - - \sa {QCircularBuffer::}{operator+=()} -*/ - -/* \fn void Qt3DCore::swap(QCircularBuffer<T> &lhs, QCircularBuffer<T> &rhs) - - Swaps the contents of the circular buffer \a lhs with the contents of \a rhs. -*/ - -/* \fn bool Qt3DCore::operator<(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) - - Returns \c true if \a lhs is lexographically less than \a rhs. This is equivalent to calling - \c{return std::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end())}. -*/ - -/* \fn bool Qt3DCore::operator>(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) - - Returns \c true if \a rhs is lexographically less than \a lhs. -*/ - -/* \fn bool Qt3DCore::operator>=(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) - - Returns \c true if \a lhs is lexographically less than or equal to \a rhs. -*/ - -/* \fn bool Qt3DCore::operator<=(const QCircularBuffer<T> &lhs, const QCircularBuffer<T> &rhs) - - Returns \c true if \a lhs is lexographically less than or equal to \a rhs. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::Iterator - - Qt-style synonym for \l iterator. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::ConstIterator - - Qt-style synonym for \l const_iterator. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::const_pointer - - Typedef for const T *. Provided for STL compatibility. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::const_reference - - Typedef for T &. Provided for STL compatibility. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::difference_type - - Typedef for ptrdiff_t. Provided for STL compatibility. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::pointer - - Typedef for T *. Provided for STL compatibility. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::reference - - Typedef for T &. Provided for STL compatibility. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::size_type - - Typedef for int. Provided for STL compatibility. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::value_type - - Typedef for T. Provided for STL compatibility. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::array_range - - Typedef for QPair<T*,int>. The first element is a pointer to the - first element of an array of T. The second element is the number - of elements in the array. - - \sa data(), dataOne(), dataTwo() -*/ - -/* \typedef Qt3DCore::QCircularBuffer::const_array_range - - Typedef for QPair<const T*,int>. The first element is a pointer to the - first element of an array of const T. The second element is the number - of elements in the array. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::ArrayRange - - Qt-style synonym for \l array_range. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::ConstArrayRange - - Qt-style synonym for \l const_array_range. -*/ - - -/* \class Qt3DCore::QCircularBuffer::iterator - \inmodule Qt3DCore - \brief The Qt3DCore::QCircularBuffer::iterator class provides an STL-style non-const iterator for QCircularBuffer. - - QCircularBuffer provides both \l{STL-Style Iterators} and \l{Java-Style - Iterators}. - - \sa begin(), end(), const_iterator -*/ - -/* \typedef Qt3DCore::QCircularBuffer::iterator::iterator_category - - A synonym for \e {std::random_access_iterator_tag} indicating - this iterator is a random access iterator. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::iterator::difference_type - - \internal -*/ - -/* \typedef Qt3DCore::QCircularBuffer::iterator::value_type - - \internal -*/ - -/* \typedef Qt3DCore::QCircularBuffer::iterator::pointer - - \internal -*/ - -/* \typedef Qt3DCore::QCircularBuffer::iterator::reference - - \internal -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator::iterator() - - Constructs an uninitialized iterator. - - Functions like operator*() and operator++() should not be called - on an uninitialized iterator. Use operator=() to assign a value - to it before using it. - - \sa begin(), end() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator::iterator(QCircularBuffer<T> *buffer, int index) - - \internal -*/ - -/* \fn T &Qt3DCore::QCircularBuffer::iterator::operator*() const - - Returns a modifiable reference to the current item. - - You can change the value of an item by using operator*() on the - left side of an assignment. - - \sa operator->() -*/ - -/* \fn T *Qt3DCore::QCircularBuffer::iterator::operator->() const - - Returns a pointer to the current item. - - \sa operator*() -*/ - -/* \fn T &Qt3DCore::QCircularBuffer::iterator::operator[](int j) const - - Returns a modifiable reference to the item at position *this + - \a{j}. - - This function is provided to make QCircularBuffer iterators behave like C++ - pointers. - - \sa operator+() -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::iterator::operator==(const iterator &other) const - - Returns \c true if \a other points to the same item as this - iterator; otherwise returns \c false. - - \sa operator!=() -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::iterator::operator!=(const iterator &other) const - - Returns \c true if \a other points to a different item than this - iterator; otherwise returns \c false. - - \sa operator==() -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::iterator::operator<(const iterator& other) const - - Returns \c true if the item pointed to by this iterator occurs before - the item pointed to by the \a other iterator. -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::iterator::operator<=(const iterator& other) const - - Returns \c true if the item pointed to by this iterator occurs before - or at the same position as the item pointed to by the \a other iterator. -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::iterator::operator>(const iterator& other) const - - Returns \c true if the item pointed to by this iterator occurs after - the item pointed to by the \a other iterator. -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::iterator::operator>=(const iterator& other) const - - Returns \c true if the item pointed to by this iterator occurs after - or at the same position as the item pointed to by the \a other iterator. -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator &Qt3DCore::QCircularBuffer::iterator::operator++() - - The prefix ++ operator (\c{++it}) advances the iterator to the - next item in the circular buffer and returns an iterator to the new current - item. - - Calling this function on end() leads to undefined results. - - \sa operator--() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator Qt3DCore::QCircularBuffer::iterator::operator++(int) - - \overload - - The postfix ++ operator (\c{it++}) advances the iterator to the - next item in the circular buffer and returns an iterator to the previously - current item. -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator &Qt3DCore::QCircularBuffer::iterator::operator--() - - The prefix -- operator (\c{--it}) makes the preceding item - the current item, and returns an iterator to the new current item. - - Calling this function on begin() leads to undefined results. - - \sa operator++() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator Qt3DCore::QCircularBuffer::iterator::operator--(int) - - \overload - - The postfix -- operator (\c{it--}) makes the preceding item - the current item, and returns an iterator to the previously current item. -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator &Qt3DCore::QCircularBuffer::iterator::operator+=(int j) - - Advances the iterator by \a j items. (If \a j is negative, the - iterator goes backward.) - - \sa operator-=(), operator+() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator &Qt3DCore::QCircularBuffer::iterator::operator-=(int j) - - Makes the iterator go back by \a j items. (If \a j is negative, - the iterator goes forward.) - - \sa operator+=(), operator-() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator Qt3DCore::QCircularBuffer::iterator::operator+(int j) const - - Returns an iterator to the item at \a j positions forward from - this iterator. (If \a j is negative, the iterator goes backward.) - - \sa operator-(), operator+=() -*/ - -/* \fn Qt3DCore::QCircularBuffer::iterator Qt3DCore::QCircularBuffer::iterator::operator-(int j) const - - Returns an iterator to the item at \a j positions backward from - this iterator. (If \a j is negative, the iterator goes forward.) - - \sa operator+(), operator-=() -*/ - -/* \fn int Qt3DCore::QCircularBuffer::iterator::operator-(iterator other) const - - Returns the number of items between the item pointed to by \a - other and the item pointed to by this iterator. -*/ - - -/* \class Qt3DCore::QCircularBuffer::const_iterator - \inmodule Qt3DCore - \brief The Qt3DCore::QCircularBuffer::const_iterator class provides an STL-style const iterator for QCircularBuffer. - - QCircularBuffer provides both \l{STL-Style Iterators} and \l{Java-Style - Iterators}. - - \sa constBegin(), constEnd(), iterator -*/ - -/* \typedef Qt3DCore::QCircularBuffer::const_iterator::iterator_category - - A synonym for \e {std::random_access_iterator_tag} indicating - this iterator is a random access iterator. -*/ - -/* \typedef Qt3DCore::QCircularBuffer::const_iterator::difference_type - - \internal -*/ - -/* \typedef Qt3DCore::QCircularBuffer::const_iterator::value_type - - \internal -*/ - -/* \typedef Qt3DCore::QCircularBuffer::const_iterator::pointer - - \internal -*/ - -/* \typedef Qt3DCore::QCircularBuffer::const_iterator::reference - - \internal -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator::const_iterator() - - Constructs an uninitialized const iterator. - - Functions like operator*() and operator++() should not be called - on an uninitialized iterator. Use operator=() to assign a value - to it before using it. - - \sa begin(), end() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator::const_iterator(const iterator &other) - - \internal -*/ - -/* \fn const T &Qt3DCore::QCircularBuffer::const_iterator::operator*() const - - Returns a const reference to the current item. - - \sa operator->() -*/ - -/* \fn const T *Qt3DCore::QCircularBuffer::const_iterator::operator->() const - - Returns a pointer to the current item. - - \sa operator*() -*/ - -/* \fn const T &Qt3DCore::QCircularBuffer::const_iterator::operator[](int j) const - - Returns a const reference to the item at position *this + - \a{j}. - - This function is provided to make QCircularBuffer iterators behave like C++ - pointers. - - \sa operator+() -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::const_iterator::operator==(const const_iterator &other) const - - Returns \c true if \a other points to the same item as this - iterator; otherwise returns \c false. - - \sa operator!=() -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::const_iterator::operator!=(const const_iterator &other) const - - Returns \c true if \a other points to a different item than this - iterator; otherwise returns \c false. - - \sa operator==() -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::const_iterator::operator<(const const_iterator& other) const - - Returns \c true if the item pointed to by this iterator occurs before - the item pointed to by the \a other iterator. -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::const_iterator::operator<=(const const_iterator& other) const - - Returns \c true if the item pointed to by this iterator occurs before, - or at the same position as the item pointed to by the \a other iterator. -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::const_iterator::operator>(const const_iterator& other) const - - Returns \c true if the item pointed to by this iterator occurs after - the item pointed to by the \a other iterator. -*/ - -/* - \fn bool Qt3DCore::QCircularBuffer::const_iterator::operator>=(const const_iterator& other) const - - Returns \c true if the item pointed to by this iterator occurs after, - or at the same position as the item pointed to by the \a other iterator. -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator &Qt3DCore::QCircularBuffer::const_iterator::operator++() - - The prefix ++ operator (\c{++it}) advances the iterator to the - next item in the circular buffer and returns an iterator to the new current - item. - - Calling this function on constEnd() leads to undefined results. - - \sa operator--() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator Qt3DCore::QCircularBuffer::const_iterator::operator++(int) - - \overload - - The postfix ++ operator (\c{it++}) advances the iterator to the - next item in the circular buffer and returns an iterator to the previously - current item. -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator &Qt3DCore::QCircularBuffer::const_iterator::operator--() - - The prefix -- operator (\c{--it}) makes the preceding item the - current and returns an iterator to the new current item. - - Calling this function on constBegin() leads to undefined results. - - \sa operator++() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator Qt3DCore::QCircularBuffer::const_iterator::operator--(int) - - \overload - - The postfix -- operator (\c{it--}) makes the preceding item the - current and returns an iterator to the previously current item. -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator &Qt3DCore::QCircularBuffer::const_iterator::operator+=(int j) - - Advances the iterator by \a j items. (If \a j is negative, the - iterator goes backward.) - - \sa operator-=(), operator+() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator &Qt3DCore::QCircularBuffer::const_iterator::operator-=(int j) - - Makes the iterator go back by \a j items. (If \a j is negative, - the iterator goes forward.) - - \sa operator+=(), operator-() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator Qt3DCore::QCircularBuffer::const_iterator::operator+(int j) const - - Returns an iterator to the item at \a j positions forward from - this iterator. (If \a j is negative, the iterator goes backward.) - - \sa operator-(), operator+=() -*/ - -/* \fn Qt3DCore::QCircularBuffer::const_iterator Qt3DCore::QCircularBuffer::const_iterator::operator-(int j) const - - Returns an iterator to the item at \a j positions backward from - this iterator. (If \a j is negative, the iterator goes forward.) - - \sa operator+(), operator-=() -*/ - -/* \fn int Qt3DCore::QCircularBuffer::const_iterator::operator-(const_iterator other) const - - Returns the number of items between the item pointed to by \a - other and the item pointed to by this iterator. -*/ diff --git a/src/render/picking/qpicktriangleevent_p.h b/src/render/picking/qpicktriangleevent_p.h index d646ac2bb..738c985d9 100644 --- a/src/render/picking/qpicktriangleevent_p.h +++ b/src/render/picking/qpicktriangleevent_p.h @@ -37,6 +37,17 @@ ** ****************************************************************************/ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #ifndef QT3DRENDER_QPICKTRIANGLEEVENT_P_H #define QT3DRENDER_QPICKTRIANGLEEVENT_P_H diff --git a/src/render/renderers/opengl/jobs/renderviewinitializerjob.cpp b/src/render/renderers/opengl/jobs/renderviewinitializerjob.cpp index 7bf55be40..982c51216 100644 --- a/src/render/renderers/opengl/jobs/renderviewinitializerjob.cpp +++ b/src/render/renderers/opengl/jobs/renderviewinitializerjob.cpp @@ -84,7 +84,6 @@ void RenderViewInitializerJob::run() #endif // Create a RenderView object - // The RenderView are created from a QFrameAllocator stored in the current Thread local storage m_renderView = new RenderView; // RenderView should allocate heap resources using only the currentFrameAllocator diff --git a/src/render/renderers/opengl/jobs/renderviewinitializerjob_p.h b/src/render/renderers/opengl/jobs/renderviewinitializerjob_p.h index fb4e2c67c..2da43a7fd 100644 --- a/src/render/renderers/opengl/jobs/renderviewinitializerjob_p.h +++ b/src/render/renderers/opengl/jobs/renderviewinitializerjob_p.h @@ -53,7 +53,6 @@ // #include <Qt3DCore/qaspectjob.h> -#include <Qt3DCore/private/qframeallocator_p.h> #include <QSize> QT_BEGIN_NAMESPACE diff --git a/src/render/renderers/opengl/jobs/renderviewjobutils_p.h b/src/render/renderers/opengl/jobs/renderviewjobutils_p.h index b2fa59785..059f6a0d5 100644 --- a/src/render/renderers/opengl/jobs/renderviewjobutils_p.h +++ b/src/render/renderers/opengl/jobs/renderviewjobutils_p.h @@ -62,10 +62,6 @@ QT_BEGIN_NAMESPACE -namespace Qt3DCore { -class QFrameAllocator; -} - namespace Qt3DRender { namespace Render { diff --git a/src/render/renderers/opengl/opengl.pri b/src/render/renderers/opengl/opengl.pri index 908c23c80..4b0d8c36b 100644 --- a/src/render/renderers/opengl/opengl.pri +++ b/src/render/renderers/opengl/opengl.pri @@ -1,3 +1,4 @@ +qtHaveModule(opengl): QT += opengl include (renderer/renderer.pri) include (jobs/jobs.pri) diff --git a/src/render/renderers/opengl/renderer/renderer_p.h b/src/render/renderers/opengl/renderer/renderer_p.h index b1cd4aac5..0af0481a3 100644 --- a/src/render/renderers/opengl/renderer/renderer_p.h +++ b/src/render/renderers/opengl/renderer/renderer_p.h @@ -110,7 +110,6 @@ class QScreen; namespace Qt3DCore { class QEntity; -class QFrameAllocator; class QEventFilterService; } @@ -338,8 +337,8 @@ private: QAtomicInt m_exposed; struct DirtyBits { - BackendNodeDirtySet marked = 0; // marked dirty since last job build - BackendNodeDirtySet remaining = 0; // remaining dirty after jobs have finished + BackendNodeDirtySet marked = {}; // marked dirty since last job build + BackendNodeDirtySet remaining = {}; // remaining dirty after jobs have finished }; DirtyBits m_dirtyBits; diff --git a/src/render/renderers/opengl/renderer/renderview_p.h b/src/render/renderers/opengl/renderer/renderview_p.h index 7ebcdb6bd..71582336a 100644 --- a/src/render/renderers/opengl/renderer/renderview_p.h +++ b/src/render/renderers/opengl/renderer/renderview_p.h @@ -67,7 +67,6 @@ #include <Qt3DRender/private/qblitframebuffer_p.h> #include <Qt3DRender/private/qwaitfence_p.h> -#include <Qt3DCore/private/qframeallocator_p.h> #include <Qt3DRender/private/aligned_malloc_p.h> // TODO: Move out once this is all refactored diff --git a/src/render/renderers/opengl/renderer/shaderparameterpack.cpp b/src/render/renderers/opengl/renderer/shaderparameterpack.cpp index 13d05cac1..39ecf19ee 100644 --- a/src/render/renderers/opengl/renderer/shaderparameterpack.cpp +++ b/src/render/renderers/opengl/renderer/shaderparameterpack.cpp @@ -42,8 +42,6 @@ #include <Qt3DRender/private/graphicscontext_p.h> #include <Qt3DRender/private/texture_p.h> -#include <Qt3DCore/private/qframeallocator_p.h> - #include <QOpenGLShaderProgram> #include <QDebug> #include <QColor> diff --git a/src/render/renderers/opengl/renderer/shaderparameterpack_p.h b/src/render/renderers/opengl/renderer/shaderparameterpack_p.h index a5aee6ac4..39cbcd724 100644 --- a/src/render/renderers/opengl/renderer/shaderparameterpack_p.h +++ b/src/render/renderers/opengl/renderer/shaderparameterpack_p.h @@ -64,10 +64,6 @@ QT_BEGIN_NAMESPACE class QOpenGLShaderProgram; -namespace Qt3DCore { -class QFrameAllocator; -} - namespace Qt3DRender { namespace Render { |