diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-06-08 10:02:23 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-06-08 10:02:23 (GMT) |
| commit | 03dc74984749adf5b11482bf871a47086217845c (patch) | |
| tree | 58eaa299c0d87d6d678fe635fddaab42177328cf /src/corelib/tools/qmap.h | |
| parent | dfd7c876263310c03d8b64033749efe2b6b1e081 (diff) | |
| parent | 0cd433404210fdaa6b21a98ef5768c9b761ed024 (diff) | |
| download | Qt-03dc74984749adf5b11482bf871a47086217845c.zip Qt-03dc74984749adf5b11482bf871a47086217845c.tar.gz Qt-03dc74984749adf5b11482bf871a47086217845c.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'src/corelib/tools/qmap.h')
| -rw-r--r-- | src/corelib/tools/qmap.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 5696ba6..e4b73a1 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -977,7 +977,7 @@ public: { return QMap<Key, T>::insertMulti(key, value); } inline QMultiMap &operator+=(const QMultiMap &other) - { unite(other); return *this; } + { this->unite(other); return *this; } inline QMultiMap operator+(const QMultiMap &other) const { QMultiMap result = *this; result += other; return result; } @@ -1052,12 +1052,7 @@ Q_INLINE_TEMPLATE int QMultiMap<Key, T>::remove(const Key &key, const T &value) typename QMap<Key, T>::iterator end(QMap<Key, T>::end()); while (i != end && !qMapLessThanKey<Key>(key, i.key())) { if (i.value() == value) { -#if defined(Q_CC_RVCT) - // RVCT has problems with scoping, apparently. - i = QMap<Key, T>::erase(i); -#else - i = erase(i); -#endif + i = this->erase(i); ++n; } else { ++i; |