diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 09:24:24 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-19 09:24:24 +1000 |
commit | 9fbbd3146c42869d56da8c82501be1e6a6595f36 (patch) | |
tree | 092af029342fa1c5a59bc30c85d7257c88718609 /src/corelib/tools/qlist.h | |
parent | 4baa9dfb5273d7b501dcb3f456983262c53cc8d1 (diff) | |
parent | 52e517b50aafd6cc0bec597abd50d8b3f7e982dd (diff) |
Merge remote branch 'origin/4.6' into integration-master-from-4.6
Conflicts:
src/corelib/codecs/qtextcodec.h
Diffstat (limited to 'src/corelib/tools/qlist.h')
-rw-r--r-- | src/corelib/tools/qlist.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 1d08c41d74..c98c5e9ed6 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -112,7 +112,7 @@ class QList public: inline QList() : d(&QListData::shared_null) { d->ref.ref(); } inline QList(const QList<T> &l) : d(l.d) { d->ref.ref(); if (!d->sharable) detach_helper(); } - ~QList(); + ~QList(); // ### Qt5: make this destructor virtual QList<T> &operator=(const QList<T> &l); bool operator==(const QList<T> &l) const; inline bool operator!=(const QList<T> &l) const { return !(*this == l); } @@ -164,7 +164,7 @@ public: public: Node *i; typedef std::random_access_iterator_tag iterator_category; - typedef ptrdiff_t difference_type; + typedef qptrdiff difference_type; typedef T value_type; typedef T *pointer; typedef T &reference; @@ -211,7 +211,7 @@ public: public: Node *i; typedef std::random_access_iterator_tag iterator_category; - typedef ptrdiff_t difference_type; + typedef qptrdiff difference_type; typedef T value_type; typedef const T *pointer; typedef const T &reference; @@ -290,7 +290,7 @@ public: typedef const value_type *const_pointer; typedef value_type &reference; typedef const value_type &const_reference; - typedef ptrdiff_t difference_type; + typedef qptrdiff difference_type; #ifdef QT3_SUPPORT inline QT3_SUPPORT iterator remove(iterator pos) { return erase(pos); } |