From: Liang Qi <liang.qi@nokia.com>
Date: Tue, 26 Apr 2011 12:01:18 +0000 (+0200)
Subject: Get rid of "typename, typename" for TEMPLATE_TEMPLATE_PARAMETERS.
X-Git-Tag: qt-v5.0.0-alpha1~4322^2~35
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=046befd0c4118d20010f70133139d1e227f47573;p=profile%2Fivi%2Fqtbase.git

Get rid of "typename, typename" for TEMPLATE_TEMPLATE_PARAMETERS.

Because Qt doesn't support that feature before.
(cherry picked from commit c12ed14fb38ae77be194e19a27545190aded830b)
---

diff --git a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
index fa675eb..98506a5 100644
--- a/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
+++ b/src/corelib/concurrent/qtconcurrentfunctionwrappers.h
@@ -260,24 +260,6 @@ struct MapResultType<InputSequence<T>, U(C::*)() const>
     typedef InputSequence<U> ResultType;
 };
 
-template <template <typename, typename> class InputSequence, typename MapFunctor, typename T, typename T2>
-struct MapResultType<InputSequence<T, T2>, MapFunctor>
-{
-    typedef InputSequence<typename LazyResultType<MapFunctor>::Type, T2> ResultType;
-};
-
-template <template <typename, typename> class InputSequence, class T, typename T2, class U, class V>
-struct MapResultType<InputSequence<T, T2>, U (*)(V)>
-{
-    typedef InputSequence<U, T2> ResultType;
-};
-
-template <template <typename, typename> class InputSequence, class T, typename T2, class U, class C>
-struct MapResultType<InputSequence<T, T2>, U(C::*)() const>
-{
-    typedef InputSequence<U, T2> ResultType;
-};
-
 #endif // QT_NO_TEMPLATE_TEMPLATE_PARAMETER
 
 template <class MapFunctor>