summaryrefslogtreecommitdiffstats
path: root/src/concurrent/qtconcurrentmap.h
diff options
context:
space:
mode:
authorLuca Di Sera <luca.disera@qt.io>2022-10-11 10:26:28 +0200
committerLuca Di Sera <luca.disera@qt.io>2022-10-21 09:48:36 +0200
commite2fef733be92e95ff28225196e14ffeb98d61a1f (patch)
tree42bc5a06849c48c89a74fc65a494a126e46b1797 /src/concurrent/qtconcurrentmap.h
parent2b35b89803bc90a3595be5386da905d79d841b73 (diff)
Replace usages of Q_CLANG_QDOC with Q_QDOC
To allow the user to customize the C++ code that QDoc sees, so as to be able to work-around some limitations on QDoc itself, QDoc defines two symbols: Q_QDOC and Q_CLANG_QDOC, both of which are "true" during an entire execution of QDoc. At a certain point in time, QDoc allowed the user the choice between a custom C++ parser and a Clang based one. The Q_QDOC symbol would always be defined while the Q_CLANG_QDOC symbol would be defined only when the Clang based parser was chosen. In more recent times, QDoc always uses a Clang based parser, such that both Q_CLANG_QDOC and Q_QDOC are always defined, making them equivalent. To avoid using different symbols, and the possible confusion and fragmentation that derives from it, all usages of Q_CLANG_QDOC are now replaced by the equivalent usages of Q_QDOC. Change-Id: I5810abb9ad1016a4c5bbea99acd03381b8514b3f Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/concurrent/qtconcurrentmap.h')
-rw-r--r--src/concurrent/qtconcurrentmap.h34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/concurrent/qtconcurrentmap.h b/src/concurrent/qtconcurrentmap.h
index ffdc4c90048..bd959f44d3c 100644
--- a/src/concurrent/qtconcurrentmap.h
+++ b/src/concurrent/qtconcurrentmap.h
@@ -10,7 +10,7 @@
#include <QtConcurrent/qtconcurrent_global.h>
-#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC)
+#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC)
#include <QtConcurrent/qtconcurrentmapkernel.h>
#include <QtConcurrent/qtconcurrentreducekernel.h>
@@ -75,7 +75,7 @@ QFuture<ResultType> mappedReduced(Sequence &&sequence,
std::forward<MapFunctor>(map), std::forward<ReduceFunctor>(reduce), options);
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType>
#else
@@ -97,7 +97,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
std::forward<ReduceFunctor>(reduce),
ResultType(std::forward<InitialValueType>(initialValue)), options);
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType>
#else
@@ -148,7 +148,7 @@ QFuture<ResultType> mappedReduced(Sequence &&sequence,
std::forward<MapFunctor>(map), std::forward<ReduceFunctor>(reduce), options);
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType>
#else
@@ -172,7 +172,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
ResultType(std::forward<InitialValueType>(initialValue)), options);
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType>
#else
@@ -223,7 +223,7 @@ QFuture<ResultType> mappedReduced(Iterator begin,
std::forward<ReduceFunctor>(reduce), options);
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType>
#else
@@ -246,7 +246,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
ResultType(std::forward<InitialValueType>(initialValue)), options);
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType>
#else
@@ -298,7 +298,7 @@ QFuture<ResultType> mappedReduced(Iterator begin,
std::forward<ReduceFunctor>(reduce), options);
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType>
#else
@@ -322,7 +322,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
ResultType(std::forward<InitialValueType>(initialValue)), options);
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType>
#else
@@ -453,7 +453,7 @@ ResultType blockingMappedReduced(Sequence &&sequence,
return future.takeResult();
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType>
#else
@@ -477,7 +477,7 @@ ResultType blockingMappedReduced(QThreadPool *pool,
return future.takeResult();
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType>
#else
@@ -533,7 +533,7 @@ ResultType blockingMappedReduced(Sequence &&sequence,
return future.takeResult();
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename ResultType,
typename InitialValueType>
#else
@@ -558,7 +558,7 @@ ResultType blockingMappedReduced(QThreadPool *pool,
return future.takeResult();
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename ResultType,
typename InitialValueType>
#else
@@ -612,7 +612,7 @@ ResultType blockingMappedReduced(Iterator begin,
return future.takeResult();
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType>
#else
@@ -637,7 +637,7 @@ ResultType blockingMappedReduced(QThreadPool *pool,
return future.takeResult();
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType>
#else
@@ -692,7 +692,7 @@ ResultType blockingMappedReduced(Iterator begin,
return future.takeResult();
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType>
#else
@@ -717,7 +717,7 @@ ResultType blockingMappedReduced(QThreadPool *pool,
return future.takeResult();
}
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType>
#else