summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qmap.h
diff options
context:
space:
mode:
authorHarald Fernengel <harald.fernengel@nokia.com>2011-08-09 11:30:03 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-09 12:00:51 +0200
commitad9f5c7e938b1d80b455acdfd0809448f2b5e1db (patch)
treeaebaf4392689880196a264015177cdd6e65cf8b5 /src/corelib/tools/qmap.h
parent92d88e475518b9f34dd068803d439892bdeaba9a (diff)
Remove all non-const operator==
We had to leave the non-const operator== for binary compatibility. Remove them all, just leave the const version in there. 100% source compatible. Change-Id: Ib7a70fb441fe51d5164d9cbf495cbeda0f48fafe Reviewed-on: http://codereview.qt.nokia.com/2773 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Robert Griebl <robert.griebl@nokia.com>
Diffstat (limited to 'src/corelib/tools/qmap.h')
-rw-r--r--src/corelib/tools/qmap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h
index 36d8eefbdb..771959a3bf 100644
--- a/src/corelib/tools/qmap.h
+++ b/src/corelib/tools/qmap.h
@@ -352,8 +352,8 @@ public:
// ### Qt 5: not sure this is necessary anymore
#ifdef QT_STRICT_ITERATORS
private:
- inline bool operator==(const iterator &o) { return operator==(const_iterator(o)); }
- inline bool operator!=(const iterator &o) { return operator!=(const_iterator(o)); }
+ inline bool operator==(const iterator &o) const { return operator==(const_iterator(o)); }
+ inline bool operator!=(const iterator &o) const { return operator!=(const_iterator(o)); }
#endif
private: