AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QFlatMap: re-implement insert() via insert_or_assign()

Browse Source 
Avoids code duplication.

Pick-to: 6.3 6.2
Change-Id: Ic69e46108baf97a0dc9215866d6c707136ee40b2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Marc Mutz 2022-01-10 11:36:23 +01:00
parent 6891e10f97
commit b17c4d0e2e
1 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/corelib/tools/qflatmap_p.h
View File

@ -679,51 +679,22 @@ public:
std::pair<iterator, bool> insert(const Key &key, const T &value)
{
auto it = lower_bound(key);
if (it == end() || key_compare::operator()(key, it.key())) {
c.values.insert(toValuesIterator(it), value);
auto k = c.keys.insert(toKeysIterator(it), key);
return { fromKeysIterator(k), true };
} else {
it.value() = value;
return {it, false};
}
return insert_or_assign(key, value);
}
std::pair<iterator, bool> insert(Key &&key, const T &value)
{
auto it = lower_bound(key);
if (it == end() || key_compare::operator()(key, it.key())) {
c.values.insert(toValuesIterator(it), value);
return { fromKeysIterator(c.keys.insert(toKeysIterator(it), std::move(key))), true };
} else {
*toValuesIterator(it) = value;
return {it, false};
}
return insert_or_assign(std::move(key), value);
}
std::pair<iterator, bool> insert(const Key &key, T &&value)
{
auto it = lower_bound(key);
if (it == end() || key_compare::operator()(key, it.key())) {
c.values.insert(toValuesIterator(it), std::move(value));
return { fromKeysIterator(c.keys.insert(toKeysIterator(it), key)), true };
} else {
*toValuesIterator(it) = std::move(value);
return {it, false};
}
return insert_or_assign(key, std::move(value));
}
std::pair<iterator, bool> insert(Key &&key, T &&value)
{
auto it = lower_bound(key);
if (it == end() || key_compare::operator()(key, it.key())) {
c.values.insert(toValuesIterator(it), std::move(value));
return { fromKeysIterator(c.keys.insert(toKeysIterator(it), std::move(key))), true };
} else {
*toValuesIterator(it) = std::move(value);
return {it, false};
}
return insert_or_assign(std::move(key), std::move(value));
}
template <typename...Args>