AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanups based on API review

Browse Source 
- Be more more consistent when declaring type aliases.
- Re-group include directives

Change-Id: Ic521e9f7692e538cc98871bdeccd9644c9879089
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
This commit is contained in:
Sona Kurazyan 2020-10-13 16:31:47 +02:00
parent e1926e5060
commit 9ded473914
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/concurrent/qtconcurrentfunctionwrappers.h
View File

@ -108,19 +108,19 @@ struct ReduceResultType;
template <class U, class V> template <class U, class V>
struct ReduceResultType<void(*)(U&,V)> struct ReduceResultType<void(*)(U&,V)>
{ {
typedef U ResultType; using ResultType = U;
}; };
template <class T, class C, class U> template <class T, class C, class U>
struct ReduceResultType<T(C::*)(U)> struct ReduceResultType<T(C::*)(U)>
{ {
typedef C ResultType; using ResultType = C;
}; };
template <class U, class V> template <class U, class V>
struct ReduceResultType<std::function<void(U&, V)>> struct ReduceResultType<std::function<void(U&, V)>>
{ {
typedef U ResultType; using ResultType = U;
}; };
template <typename R, typename ...A> template <typename R, typename ...A>
@ -133,13 +133,13 @@ struct ReduceResultType<R(*)(A...)>
template <class U, class V> template <class U, class V>
struct ReduceResultType<void(*)(U&,V) noexcept> struct ReduceResultType<void(*)(U&,V) noexcept>
{ {
typedef U ResultType; using ResultType = U;
}; };
template <class T, class C, class U> template <class T, class C, class U>
struct ReduceResultType<T(C::*)(U) noexcept> struct ReduceResultType<T(C::*)(U) noexcept>
{ {
typedef C ResultType; using ResultType = C;
}; };
#endif #endif

4
src/concurrent/qtconcurrentstoredfunctioncall.h
View File

@ -44,10 +44,10 @@
#ifndef QT_NO_CONCURRENT #ifndef QT_NO_CONCURRENT
#include <QtConcurrent/qtconcurrentrunbase.h> #include <QtConcurrent/qtconcurrentrunbase.h>
#include <type_traits>
#include <QtCore/qpromise.h> #include <QtCore/qpromise.h>
#include <type_traits>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef Q_QDOC #ifndef Q_QDOC