Make Utils::transform more generic

- Works for all container types now, defaulting to
  the same container type for input and output

- Enables specifying the result container type,
  e.g. QSet<X> x = Utils::transform<QSet>(list, function);

- Use our own inserter instead of std::back_inserter,
  to enable usage with QSet<>

Change-Id: I7256e51430bfc1409456c68b6ee270778b95e9d5
Reviewed-by: hjk <hjk121@nokiamail.com>

src/libs/utils/algorithm.h

@@ -35,6 +35,7 @@
 
 #include <algorithm>
 #include <functional>
+#include <QStringList>
 
 namespace Utils
 {
@@ -140,13 +141,100 @@ auto equal(R (S::*function)() const, T value)
 // transform
 /////////////////
 
-// transform taking a member function pointer
+namespace {
-template<typename T, typename R, typename S>
+// needed for msvc 2010, that doesn't have a declval
-Q_REQUIRED_RESULT
+// can be removed once we stop supporting it
-auto transform(const QList<T> &container, R (S::*p)() const)
+template<typename T>
-    -> QList<typename std::remove_cv<typename std::remove_reference<R>::type>::type>
+T &&declval();
+
+/////////////////
+// helper code for transform to use back_inserter and thus push_back for everything
+// and insert for QSet<>
+//
+
+// QSetInsertIterator, straight from the standard for insert_iterator
+// just without the additional parameter to insert
+template <class Container>
+  class QSetInsertIterator :
+    public std::iterator<std::output_iterator_tag,void,void,void,void>
 {
-    QList<typename std::remove_cv<typename std::remove_reference<R>::type>::type> result;
+protected:
+  Container *container;
+
+public:
+  typedef Container container_type;
+  explicit QSetInsertIterator (Container &x)
+    : container(&x) {}
+  QSetInsertIterator<Container> &operator=(const typename Container::value_type &value)
+    { container->insert(value); return *this; }
+  QSetInsertIterator<Container> &operator= (typename Container::value_type &&value)
+    { container->insert(std::move(value)); return *this; }
+  QSetInsertIterator<Container >&operator*()
+    { return *this; }
+  QSetInsertIterator<Container> &operator++()
+    { return *this; }
+  QSetInsertIterator<Container> operator++(int)
+    { return *this; }
+};
+
+// inserter helper function, returns a std::back_inserter for most containers
+// and is overloaded for QSet<> to return a QSetInsertIterator
+template<typename C>
+inline std::back_insert_iterator<C>
+inserter(C &container)
+{
+    return std::back_inserter(container);
+}
+
+template<typename X>
+inline QSetInsertIterator<QSet<X>>
+inserter(QSet<X> &container)
+{
+    return QSetInsertIterator<QSet<X>>(container);
+}
+
+// helper: removes const, volatile and references from a type
+template<typename T>
+struct RemoveCvAndReference
+{
+    typedef typename std::remove_cv<typename std::remove_reference<T>::type>::type type;
+};
+
+template<typename F, typename T>
+struct ResultOfFunctionWithoutCvAndReference
+{
+    typedef typename RemoveCvAndReference<decltype(declval<F>()(declval<T>()))>::type type;
+};
+
+// actual implementation of transform
+template<template<typename> class C, // result container type
+         template<typename> class SC, // input container type
+         typename T, // element type of input container
+         typename F> // function type
+Q_REQUIRED_RESULT
+auto transform_impl(const SC<T> &container, F function)
+     -> C<typename ResultOfFunctionWithoutCvAndReference<F, T>::type>
+{
+    C<typename ResultOfFunctionWithoutCvAndReference<F, T>::type> result;
+    result.reserve(container.size());
+    std::transform(container.begin(), container.end(),
+                   inserter(result),
+                   function);
+    return result;
+}
+
+}
+
+// transform taking a member function pointer
+template<template<typename> class C,
+        typename T,
+        typename R,
+        typename S>
+Q_REQUIRED_RESULT
+auto transform(const C<T> &container, R (S::*p)() const)
+    -> C<typename RemoveCvAndReference<R>::type>
+{
+    C<typename RemoveCvAndReference<R>::type> result;
     result.reserve(container.size());
     std::transform(container.begin(), container.end(),
                    std::back_inserter(result),
@@ -154,25 +242,53 @@ auto transform(const QList<T> &container, R (S::*p)() const)
     return result;
 }
 
-namespace {
+// same container type for input and output, e.g. transforming a QList<QString> into QList<int>
-// needed for msvc 2010, that doesn't have a declval
+template<template<typename> class C, // container
-// can be removed once we stop supporting it
+         typename T, // element type
-template<typename T>
+         typename F> // function type
-T &&declval();
+Q_REQUIRED_RESULT
+auto transform(const C<T> &container, F function)
+     -> C<typename RemoveCvAndReference<decltype(declval<F>()(declval<T>()))>::type>
+{
+    return transform_impl<QList>(container, function);
 }
 
-// Note: add overloads for other container types as needed
+// different container types for input and output, e.g. transforming a QList into a QSet
-template<typename T, typename F>
+template<template<typename> class C, // result container type
+         template<typename> class SC, // input container type
+         typename T, // element type of input container
+         typename F> // function type
 Q_REQUIRED_RESULT
-auto transform(const QList<T> &container, F function)
+auto transform(const SC<T> &container, F function)
-     -> QList<typename std::remove_cv<typename std::remove_reference<decltype(function(declval<T>()))>::type>::type>
+     -> C<typename RemoveCvAndReference<decltype(declval<F>()(declval<T>()))>::type>
 {
-    QList<typename std::remove_cv<typename std::remove_reference<decltype(function(declval<T>()))>::type>::type> result;
+    return transform_impl(container, function);
-    result.reserve(container.size());
+}
-    std::transform(container.begin(), container.end(),
+
-                   std::back_inserter(result),
+
-                   function);
+//////////
-    return result;
+// transform for QStringList, because that isn't a specialization but a separate type
+// and g++ doesn't want to use the above templates for that
+// clang and msvc do find the base class QList<QString>
+//////////
+
+// QStringList -> QList<>
+template<typename F> // function type
+Q_REQUIRED_RESULT
+auto transform(const QStringList &container, F function)
+     -> QList<typename RemoveCvAndReference<decltype(declval<F>()(declval<QString>()))>::type>
+{
+    return transform_impl<QList>(QList<QString>(container), function);
+}
+
+// QStringList -> any container type
+template<template<typename> class C, // result container type
+         typename F> // function type
+Q_REQUIRED_RESULT
+auto transform(const QStringList &container, F function)
+     -> C<typename RemoveCvAndReference<decltype(declval<F>()(declval<QString>()))>::type>
+{
+    return transform_impl<C>(QList<QString>(container), function);
 }
 
 //////////////////

src/libs/utils/codegeneration.cpp

@@ -110,8 +110,8 @@ void writeQtIncludeSection(const QStringList &qt4,
     else
         trans = [](const QString &i) { return i.mid(i.indexOf(QLatin1Char('/')) + 1); };
 
-    QSet<QString> qt4Only = QSet<QString>::fromList(Utils::transform(qt4, trans));
+    QSet<QString> qt4Only = Utils::transform<QSet>(qt4, trans);
-    QSet<QString> qt5Only = QSet<QString>::fromList(Utils::transform(qt5, trans));
+    QSet<QString> qt5Only = Utils::transform<QSet>(qt5, trans);
 
     if (addQtVersionCheck) {
         QSet<QString> common = qt4Only;