Utils::transform: Allow usage with non-const source containers

Makes it possible to e.g. transform to list of reference_wrappers.

Change-Id: Ib608034fc3f296824c289edd27563bc7a196ac6d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Eike Ziller
2017-12-16 20:39:33 +01:00
parent 479ab4ef22
commit e0a23664aa
2 changed files with 102 additions and 43 deletions

View File

@@ -306,6 +306,37 @@ void tst_Algorithm::transform()
const QVector<double> trans = Utils::transform<QVector<double>>(v, &Struct::member);
QCOMPARE(trans, QVector<double>({1.0, 2.0, 3.0, 4.0}));
}
{
// non-const container and function parameter
// same container type
std::vector<Struct> v({1, 2, 3, 4});
const std::vector<std::reference_wrapper<Struct>> trans
= Utils::transform(v, [](Struct &s) { return std::ref(s); });
// different container type
QVector<Struct> v2({1, 2, 3, 4});
const std::vector<std::reference_wrapper<Struct>> trans2
= Utils::transform<std::vector>(v, [](Struct &s) { return std::ref(s); });
// temporaries
const auto tempv = [] { return QList<Struct>({1, 2, 3, 4}); };
// temporary with member function
const QList<int> trans3 = Utils::transform(tempv(), &Struct::getMember);
const std::vector<int> trans4 = Utils::transform<std::vector>(tempv(), &Struct::getMember);
const std::vector<int> trans5 = Utils::transform<std::vector<int>>(tempv(), &Struct::getMember);
// temporary with member
const QList<int> trans6 = Utils::transform(tempv(), &Struct::member);
const std::vector<int> trans7 = Utils::transform<std::vector>(tempv(), &Struct::member);
const std::vector<int> trans8 = Utils::transform<std::vector<int>>(tempv(), &Struct::member);
// temporary with function
const QList<int> trans9 = Utils::transform(tempv(),
[](const Struct &s) { return s.getMember(); });
const std::vector<int> trans10 = Utils::transform<std::vector>(tempv(), [](const Struct &s) {
return s.getMember();
});
const std::vector<int> trans11 = Utils::transform<std::vector<int>>(tempv(),
[](const Struct &s) {
return s.getMember();
});
}
}
void tst_Algorithm::sort()