equal
deleted
inserted
replaced
1 /**************************************************************************** |
1 /**************************************************************************** |
2 ** |
2 ** |
3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). |
3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 ** All rights reserved. |
4 ** All rights reserved. |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
6 ** |
6 ** |
7 ** This file is part of the QtCore module of the Qt Toolkit. |
7 ** This file is part of the QtCore module of the Qt Toolkit. |
8 ** |
8 ** |
211 friend class const_iterator; |
211 friend class const_iterator; |
212 QMapData::Node *i; |
212 QMapData::Node *i; |
213 |
213 |
214 public: |
214 public: |
215 typedef std::bidirectional_iterator_tag iterator_category; |
215 typedef std::bidirectional_iterator_tag iterator_category; |
216 typedef ptrdiff_t difference_type; |
216 typedef qptrdiff difference_type; |
217 typedef T value_type; |
217 typedef T value_type; |
218 typedef T *pointer; |
218 typedef T *pointer; |
219 typedef T &reference; |
219 typedef T &reference; |
220 |
220 |
221 // ### Qt 5: get rid of 'operator Node *' |
221 // ### Qt 5: get rid of 'operator Node *' |
279 friend class iterator; |
279 friend class iterator; |
280 QMapData::Node *i; |
280 QMapData::Node *i; |
281 |
281 |
282 public: |
282 public: |
283 typedef std::bidirectional_iterator_tag iterator_category; |
283 typedef std::bidirectional_iterator_tag iterator_category; |
284 typedef ptrdiff_t difference_type; |
284 typedef qptrdiff difference_type; |
285 typedef T value_type; |
285 typedef T value_type; |
286 typedef const T *pointer; |
286 typedef const T *pointer; |
287 typedef const T &reference; |
287 typedef const T &reference; |
288 |
288 |
289 // ### Qt 5: get rid of 'operator Node *' |
289 // ### Qt 5: get rid of 'operator Node *' |
382 QMap<Key, T> &unite(const QMap<Key, T> &other); |
382 QMap<Key, T> &unite(const QMap<Key, T> &other); |
383 |
383 |
384 // STL compatibility |
384 // STL compatibility |
385 typedef Key key_type; |
385 typedef Key key_type; |
386 typedef T mapped_type; |
386 typedef T mapped_type; |
387 typedef ptrdiff_t difference_type; |
387 typedef qptrdiff difference_type; |
388 typedef int size_type; |
388 typedef int size_type; |
389 inline bool empty() const { return isEmpty(); } |
389 inline bool empty() const { return isEmpty(); } |
390 |
390 |
391 #ifdef QT_QMAP_DEBUG |
391 #ifdef QT_QMAP_DEBUG |
392 inline void dump() const { d->dump(); } |
392 inline void dump() const { d->dump(); } |