From 9ad8b80fb970cfe96c7c7bae781b20528b2ce334 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Wed, 25 Mar 2020 15:28:04 +0100 Subject: Remove some dead code Change-Id: I526d9baee260f018cec6076595a28be8596b6395 Reviewed-by: Edward Welbourne Reviewed-by: Vitaly Fanaskov Reviewed-by: Alex Blasche --- src/concurrent/qtconcurrentfunctionwrappers.h | 34 --------------------------- src/concurrent/qtconcurrentmap.cpp | 12 ---------- 2 files changed, 46 deletions(-) diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index 7ba6720e03..4731de77cc 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -49,23 +49,6 @@ QT_BEGIN_NAMESPACE namespace QtConcurrent { -template -class FunctionWrapper0 -{ -public: - typedef T (*FunctionPointerType)(); - typedef T result_type; - inline FunctionWrapper0(FunctionPointerType _functionPointer) - :functionPointer(_functionPointer) { } - - inline T operator()() - { - return functionPointer(); - } -private: - FunctionPointerType functionPointer; -}; - template class FunctionWrapper1 { @@ -84,23 +67,6 @@ private: FunctionPointerType functionPointer; }; -template -class FunctionWrapper2 -{ -public: - typedef T (*FunctionPointerType)(U u, V v); - typedef T result_type; - inline FunctionWrapper2(FunctionPointerType _functionPointer) - :functionPointer(_functionPointer) { } - - inline T operator()(U u, V v) - { - return functionPointer(u, v); - } -private: - FunctionPointerType functionPointer; -}; - template class MemberFunctionWrapper { diff --git a/src/concurrent/qtconcurrentmap.cpp b/src/concurrent/qtconcurrentmap.cpp index eff381c567..92fe7a98f2 100644 --- a/src/concurrent/qtconcurrentmap.cpp +++ b/src/concurrent/qtconcurrentmap.cpp @@ -523,24 +523,12 @@ \sa blockingMappedReduced(), {Concurrent Map and Map-Reduce} */ -/*! - \class QtConcurrent::FunctionWrapper0 - \inmodule QtConcurrent - \internal -*/ - /*! \class QtConcurrent::FunctionWrapper1 \inmodule QtConcurrent \internal */ -/*! - \class QtConcurrent::FunctionWrapper2 - \inmodule QtConcurrent - \internal -*/ - /*! \class QtConcurrent::MemberFunctionWrapper \inmodule QtConcurrent -- cgit v1.2.3