diff options
-rw-r--r-- | src/corelib/tools/qmap.h | 2 | ||||
-rw-r--r-- | tests/auto/corelib/tools/qmap/tst_qmap.cpp | 25 | ||||
-rw-r--r-- | tests/benchmarks/corelib/tools/qmap/main.cpp | 15 |
3 files changed, 41 insertions, 1 deletions
diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index e0b267ce20..d44a79473d 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -939,7 +939,7 @@ Q_OUTOFLINE_TEMPLATE QMap<Key, T>::QMap(const std::map<Key, T> &other) typename std::map<Key,T>::const_iterator it = other.end(); while (it != other.begin()) { --it; - insert((*it).first, (*it).second); + d->createNode((*it).first, (*it).second, d->begin(), true); // insert on most left node. } } diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp index 9c53563a5c..e64496352c 100644 --- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp +++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp @@ -55,6 +55,7 @@ protected: public slots: void init(); private slots: + void ctor(); void count(); void clear(); void beginEnd(); @@ -146,6 +147,30 @@ void tst_QMap::init() MyClass::count = 0; } +void tst_QMap::ctor() +{ + std::map<int, int> map; + for (int i = 0; i < 100000; ++i) + map.insert(std::pair<int, int>(i * 3, i * 7)); + + QMap<int, int> qmap(map); // ctor. + + // Check that we have the same + std::map<int, int>::iterator j = map.begin(); + QMap<int, int>::const_iterator i = qmap.constBegin(); + + while (i != qmap.constEnd()) { + QCOMPARE( (*j).first, i.key()); + QCOMPARE( (*j).second, i.value()); + ++i; + ++j; + } + + QCOMPARE( (int) map.size(), qmap.size()); +} + + + void tst_QMap::count() { { diff --git a/tests/benchmarks/corelib/tools/qmap/main.cpp b/tests/benchmarks/corelib/tools/qmap/main.cpp index 4d9833b7a1..c11e54ff1d 100644 --- a/tests/benchmarks/corelib/tools/qmap/main.cpp +++ b/tests/benchmarks/corelib/tools/qmap/main.cpp @@ -62,6 +62,8 @@ private slots: void iteration(); void toStdMap(); void iterator_begin(); + + void ctorStdMap(); }; @@ -189,6 +191,19 @@ void tst_QMap::iterator_begin() } } +void tst_QMap::ctorStdMap() +{ + std::map<int, int> map; + for (int i = 0; i < 100000; ++i) + map.insert(std::pair<int, int>(i, i)); + + QBENCHMARK { + QMap<int, int> qmap(map); + qmap.constBegin(); + } +} + + QTEST_MAIN(tst_QMap) #include "main.moc" |