diff options
| author | Debao Zhang <hello@debao.me> | 2012-12-28 14:18:53 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-08 10:48:33 +0100 |
| commit | 39795b1411a5ed17c47ef638c693d4b788442d0c (patch) | |
| tree | 9862b40a06e239d4486966f9b972a475f7170da3 /src/concurrent/qtconcurrentreducekernel.h | |
| parent | 742f0c6e0b8e3ec6fddc146205e78a93f600c1cf (diff) | |
Replace macro qdoc with Q_QDOC
Both qdoc and Q_QDOC are used in source code, which looks not good.
Change-Id: I4f3a71670278b0758d92bfa5db086a07e1b1acfd
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Diffstat (limited to 'src/concurrent/qtconcurrentreducekernel.h')
| -rw-r--r-- | src/concurrent/qtconcurrentreducekernel.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h index 9bcc900579..84487917ad 100644 --- a/src/concurrent/qtconcurrentreducekernel.h +++ b/src/concurrent/qtconcurrentreducekernel.h @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE namespace QtConcurrent { -#ifndef qdoc +#ifndef Q_QDOC /* The ReduceQueueStartLimit and ReduceQueueThrottleLimit constants @@ -85,7 +85,7 @@ public: QVector<T> vector; }; -#endif // qdoc +#endif // Q_QDOC enum ReduceOption { UnorderedReduce = 0x1, @@ -96,7 +96,7 @@ enum ReduceOption { Q_DECLARE_FLAGS(ReduceOptions, ReduceOption) Q_DECLARE_OPERATORS_FOR_FLAGS(ReduceOptions) -#ifndef qdoc +#ifndef Q_QDOC // supports both ordered and out-of-order reduction template <typename ReduceFunctor, typename ReduceResultType, typename T> @@ -242,7 +242,7 @@ struct SequenceHolder2 : public Base } }; -#endif //qdoc +#endif //Q_QDOC } // namespace QtConcurrent |