diff options
Diffstat (limited to 'src/corelib/tools/qmap.cpp')
| -rw-r--r-- | src/corelib/tools/qmap.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index cd139f01d4..6c9eba0c66 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -301,7 +301,7 @@ void QMapDataBase::recalcMostLeftNode() mostLeftNode = mostLeftNode->left; } -static inline int qMapAlignmentThreshold() +static inline size_t qMapAlignmentThreshold() { // malloc on 32-bit platforms should return pointers that are 8-byte // aligned or more while on 64-bit platforms they should be 16-byte aligned @@ -309,14 +309,14 @@ static inline int qMapAlignmentThreshold() return 2 * sizeof(void*); } -static inline void *qMapAllocate(int alloc, int alignment) +static inline void *qMapAllocate(size_t alloc, size_t alignment) { return alignment > qMapAlignmentThreshold() ? qMallocAligned(alloc, alignment) : ::malloc(alloc); } -static inline void qMapDeallocate(QMapNodeBase *node, int alignment) +static inline void qMapDeallocate(QMapNodeBase *node, size_t alignment) { if (alignment > qMapAlignmentThreshold()) qFreeAligned(node); @@ -324,7 +324,7 @@ static inline void qMapDeallocate(QMapNodeBase *node, int alignment) ::free(node); } -QMapNodeBase *QMapDataBase::createNode(int alloc, int alignment, QMapNodeBase *parent, bool left) +QMapNodeBase *QMapDataBase::createNode(size_t alloc, size_t alignment, QMapNodeBase *parent, bool left) { QMapNodeBase *node = static_cast<QMapNodeBase *>(qMapAllocate(alloc, alignment)); Q_CHECK_PTR(node); @@ -346,7 +346,7 @@ QMapNodeBase *QMapDataBase::createNode(int alloc, int alignment, QMapNodeBase *p return node; } -void QMapDataBase::freeTree(QMapNodeBase *root, int alignment) +void QMapDataBase::freeTree(QMapNodeBase *root, size_t alignment) { if (root->left) freeTree(root->left, alignment); @@ -619,7 +619,7 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa operator==() */ -/*! \fn template <class Key, class T> int QMap<Key, T>::size() const +/*! \fn template <class Key, class T> qsizetype QMap<Key, T>::size() const Returns the number of (key, value) pairs in the map. @@ -672,7 +672,7 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa remove() */ -/*! \fn template <class Key, class T> int QMap<Key, T>::remove(const Key &key) +/*! \fn template <class Key, class T> qsizetype QMap<Key, T>::remove(const Key &key) Removes all the items that have the key \a key from the map. Returns the number of items removed which will be 1 if the key @@ -704,7 +704,7 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa count(), QMultiMap::contains() */ -/*! \fn template <class Key, class T> const T QMap<Key, T>::value(const Key &key, const T &defaultValue) const +/*! \fn template <class Key, class T> T QMap<Key, T>::value(const Key &key, const T &defaultValue) const Returns the value associated with the key \a key. @@ -812,14 +812,14 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa QMultiMap::values() */ -/*! \fn template <class Key, class T> int QMap<Key, T>::count(const Key &key) const +/*! \fn template <class Key, class T> qsizetype QMap<Key, T>::count(const Key &key) const Returns the number of items associated with key \a key. \sa contains(), QMultiMap::count() */ -/*! \fn template <class Key, class T> int QMap<Key, T>::count() const +/*! \fn template <class Key, class T> qsizetype QMap<Key, T>::count() const \overload @@ -1466,7 +1466,7 @@ void QMapDataBase::freeData(QMapDataBase *d) current item. */ -/*! \fn template <class Key, class T> QMap<Key, T>::iterator QMap<Key, T>::iterator::operator+(int j) const +/*! \fn template <class Key, class T> QMap<Key, T>::iterator QMap<Key, T>::iterator::operator+(qsizetype 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.) @@ -1477,7 +1477,7 @@ void QMapDataBase::freeData(QMapDataBase *d) */ -/*! \fn template <class Key, class T> QMap<Key, T>::iterator QMap<Key, T>::iterator::operator-(int j) const +/*! \fn template <class Key, class T> QMap<Key, T>::iterator QMap<Key, T>::iterator::operator-(qsizetype 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.) @@ -1487,7 +1487,7 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa operator+() */ -/*! \fn template <class Key, class T> QMap<Key, T>::iterator &QMap<Key, T>::iterator::operator+=(int j) +/*! \fn template <class Key, class T> QMap<Key, T>::iterator &QMap<Key, T>::iterator::operator+=(qsizetype j) Advances the iterator by \a j items. (If \a j is negative, the iterator goes backward.) @@ -1495,7 +1495,7 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa operator-=(), operator+() */ -/*! \fn template <class Key, class T> QMap<Key, T>::iterator &QMap<Key, T>::iterator::operator-=(int j) +/*! \fn template <class Key, class T> QMap<Key, T>::iterator &QMap<Key, T>::iterator::operator-=(qsizetype j) Makes the iterator go back by \a j items. (If \a j is negative, the iterator goes forward.) @@ -1680,7 +1680,7 @@ void QMapDataBase::freeData(QMapDataBase *d) current item. */ -/*! \fn template <class Key, class T> QMap<Key, T>::const_iterator QMap<Key, T>::const_iterator::operator+(int j) const +/*! \fn template <class Key, class T> QMap<Key, T>::const_iterator QMap<Key, T>::const_iterator::operator+(qsizetype 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.) @@ -1690,7 +1690,7 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa operator-() */ -/*! \fn template <class Key, class T> QMap<Key, T>::const_iterator QMap<Key, T>::const_iterator::operator-(int j) const +/*! \fn template <class Key, class T> QMap<Key, T>::const_iterator QMap<Key, T>::const_iterator::operator-(qsizetype 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.) @@ -1700,7 +1700,7 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa operator+() */ -/*! \fn template <class Key, class T> QMap<Key, T>::const_iterator &QMap<Key, T>::const_iterator::operator+=(int j) +/*! \fn template <class Key, class T> QMap<Key, T>::const_iterator &QMap<Key, T>::const_iterator::operator+=(qsizetype j) Advances the iterator by \a j items. (If \a j is negative, the iterator goes backward.) @@ -1710,7 +1710,7 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa operator-=(), operator+() */ -/*! \fn template <class Key, class T> QMap<Key, T>::const_iterator &QMap<Key, T>::const_iterator::operator-=(int j) +/*! \fn template <class Key, class T> QMap<Key, T>::const_iterator &QMap<Key, T>::const_iterator::operator-=(qsizetype j) Makes the iterator go back by \a j items. (If \a j is negative, the iterator goes forward.) @@ -2042,7 +2042,7 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn template <class Key, class T> int QMultiMap<Key, T>::remove(const Key &key, const T &value) + \fn template <class Key, class T> qsizetype QMultiMap<Key, T>::remove(const Key &key, const T &value) \since 4.3 Removes all the items that have the key \a key and the value \a @@ -2052,7 +2052,7 @@ void QMapDataBase::freeData(QMapDataBase *d) */ /*! - \fn template <class Key, class T> int QMultiMap<Key, T>::count(const Key &key, const T &value) const + \fn template <class Key, class T> qsizetype QMultiMap<Key, T>::count(const Key &key, const T &value) const \since 4.3 Returns the number of items with key \a key and value \a value. |