feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Improve Utils::contains

Browse Source 
* Consistently use anyOf to implement contains.
* Support contains over an container of std::unique_ptr matching a pointer.

Change-Id: I0180f3ec3d5935d8afeeac67a745d4b38a01674d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-11-30 17:03:22 +01:00
parent 9b832f670d
commit 33fc20ab51
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libs/utils/algorithm.h
View File

@@ -96,11 +96,26 @@ void erase(T &container, F predicate)
template<typename T, typename F>
bool contains(const T &container, F function)
{
typename T::const_iterator begin = std::begin(container);
typename T::const_iterator end = std::end(container);
return anyOf(container, function);
}
typename T::const_iterator it = std::find_if(begin, end, function);
return it != end;
// Contains for normal pointers in std::vector<std::unique_ptr>
template<template<typename, typename...> class C, typename T, typename... Args>
bool contains(const C<T, Args...> &container, typename T::element_type *other)
{
return anyOf(container, [other](const typename C<T, Args...>::value_type &value) { return value.get() == other; });
}
template<typename T, typename R, typename S>
bool contains(const T &container, R (S::*function)() const)
{
return anyOf(container, function);
}
template<template<typename, typename...> class C, typename... Args, typename T, typename R, typename S>
bool contains(const C<T, Args...> &container, R (S::*function)() const)
{
return anyOf(container, function);
}
//////////////////