From 302cc32deed6f230fa3987f94e962b0f0d43439a Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Wed, 17 Jun 2015 16:00:05 +0200
Subject: QMap: add const equal_range() overload
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

... to prevent detaching.

[ChangeLog][QtCore][QMap] Added const equal_range() overload.

Change-Id: I4b39abb8ad41ba6eaa8f9a9a74ed74ed10337dd3
Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 tests/auto/corelib/tools/qmap/tst_qmap.cpp | 34 ++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'tests/auto/corelib/tools/qmap/tst_qmap.cpp')

diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
index 8560a2f18c..619f04337c 100644
--- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp
+++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
@@ -996,11 +996,16 @@ void tst_QMap::const_shared_null()
 void tst_QMap::equal_range()
 {
     QMap<int, QString> map;
+    const QMap<int, QString> &cmap = map;
 
     QPair<QMap<int, QString>::iterator, QMap<int, QString>::iterator> result = map.equal_range(0);
     QCOMPARE(result.first, map.end());
     QCOMPARE(result.second, map.end());
 
+    QPair<QMap<int, QString>::const_iterator, QMap<int, QString>::const_iterator> cresult = cmap.equal_range(0);
+    QCOMPARE(cresult.first, cmap.cend());
+    QCOMPARE(cresult.second, cmap.cend());
+
     map.insert(1, "one");
 
     result = map.equal_range(0);
@@ -1015,6 +1020,18 @@ void tst_QMap::equal_range()
     QCOMPARE(result.first, map.end());
     QCOMPARE(result.second, map.end());
 
+    cresult = cmap.equal_range(0);
+    QCOMPARE(cresult.first, cmap.find(1));
+    QCOMPARE(cresult.second, cmap.find(1));
+
+    cresult = cmap.equal_range(1);
+    QCOMPARE(cresult.first, cmap.find(1));
+    QCOMPARE(cresult.second, cmap.cend());
+
+    cresult = cmap.equal_range(2);
+    QCOMPARE(cresult.first, cmap.cend());
+    QCOMPARE(cresult.second, cmap.cend());
+
     for (int i = -10; i < 10; i += 2)
         map.insert(i, QString("%1").arg(i));
 
@@ -1030,11 +1047,28 @@ void tst_QMap::equal_range()
     QCOMPARE(result.first, map.find(2));
     QCOMPARE(result.second, map.find(4));
 
+    cresult = cmap.equal_range(0);
+    QCOMPARE(cresult.first, cmap.find(0));
+    QCOMPARE(cresult.second, cmap.find(1));
+
+    cresult = cmap.equal_range(1);
+    QCOMPARE(cresult.first, cmap.find(1));
+    QCOMPARE(cresult.second, cmap.find(2));
+
+    cresult = cmap.equal_range(2);
+    QCOMPARE(cresult.first, cmap.find(2));
+    QCOMPARE(cresult.second, cmap.find(4));
+
     map.insertMulti(1, "another one");
+
     result = map.equal_range(1);
     QCOMPARE(result.first, map.find(1));
     QCOMPARE(result.second, map.find(2));
 
+    cresult = cmap.equal_range(1);
+    QCOMPARE(cresult.first, cmap.find(1));
+    QCOMPARE(cresult.second, cmap.find(2));
+
     QCOMPARE(map.count(1), 2);
 }
 
-- 
cgit v1.2.3