From 4133ff0ab6235779eb9427be85357dab08dd0bab Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Thu, 7 Jul 2016 11:28:24 +0200
Subject: [PATCH] Add functionResult_t as convenience for using functionTraits

Allows
  functionResult_t<F>
instead of
  typename functionTraits<F>::ResultType

Change-Id: Ia85973a890303c38b598e25b2a476f659fc5c359
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/libs/utils/functiontraits.h | 3 +++
 src/libs/utils/mapreduce.h      | 6 +++---
 src/libs/utils/runextensions.h  | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/libs/utils/functiontraits.h b/src/libs/utils/functiontraits.h
index 2544b525d91..4c172eefba3 100644
--- a/src/libs/utils/functiontraits.h
+++ b/src/libs/utils/functiontraits.h
@@ -155,6 +155,9 @@ struct functionTraits<Callable&&> : public functionTraits<Callable>
 {
 };
 
+template <typename F>
+using functionResult_t = typename functionTraits<F>::ResultType;
+
 ////////////////////
 // functionTakesArgument
 ////////////////////
diff --git a/src/libs/utils/mapreduce.h b/src/libs/utils/mapreduce.h
index 007056ecc81..828b16b31f9 100644
--- a/src/libs/utils/mapreduce.h
+++ b/src/libs/utils/mapreduce.h
@@ -243,7 +243,7 @@ protected:
 };
 
 template <typename ResultType, typename Function, typename... Args>
-typename functionTraits<Function>::ResultType
+functionResult_t<Function>
 callWithMaybeFutureInterfaceDispatch(std::false_type, QFutureInterface<ResultType> &,
                                      Function &&function, Args&&... args)
 {
@@ -251,7 +251,7 @@ callWithMaybeFutureInterfaceDispatch(std::false_type, QFutureInterface<ResultTyp
 }
 
 template <typename ResultType, typename Function, typename... Args>
-typename functionTraits<Function>::ResultType
+functionResult_t<Function>
 callWithMaybeFutureInterfaceDispatch(std::true_type, QFutureInterface<ResultType> &futureInterface,
                                      Function &&function, Args&&... args)
 {
@@ -259,7 +259,7 @@ callWithMaybeFutureInterfaceDispatch(std::true_type, QFutureInterface<ResultType
 }
 
 template <typename ResultType, typename Function, typename... Args>
-typename functionTraits<Function>::ResultType
+functionResult_t<Function>
 callWithMaybeFutureInterface(QFutureInterface<ResultType> &futureInterface,
                              Function &&function, Args&&... args)
 {
diff --git a/src/libs/utils/runextensions.h b/src/libs/utils/runextensions.h
index e08cc02bd6f..43a25411d6e 100644
--- a/src/libs/utils/runextensions.h
+++ b/src/libs/utils/runextensions.h
@@ -98,7 +98,7 @@ struct resultTypeWithArgument<Function, QFutureInterface<ResultType>&>
 template <typename Function, typename Arg>
 struct resultTypeWithArgument
 {
-    using type = typename functionTraits<Function>::ResultType;
+    using type = functionResult_t<Function>;
 };
 
 template <typename Function, int index>
@@ -110,7 +110,7 @@ struct resultTypeTakesArguments<Function, index, true>
 template <typename Function, int index>
 struct resultTypeTakesArguments<Function, index, false>
 {
-    using type = typename functionTraits<Function>::ResultType;
+    using type = functionResult_t<Function>;
 };
 
 template <typename Function>