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 | |
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')
-rw-r--r-- | src/concurrent/qtconcurrentfilter.h | 4 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentfilterkernel.h | 4 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentfunctionwrappers.h | 4 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentiteratekernel.h | 4 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentmap.h | 4 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentmapkernel.h | 4 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentmedian.h | 4 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentreducekernel.h | 8 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentrun.h | 4 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentrunbase.h | 4 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentstoredfunctioncall.h | 4 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentthreadengine.h | 4 |
12 files changed, 26 insertions, 26 deletions
diff --git a/src/concurrent/qtconcurrentfilter.h b/src/concurrent/qtconcurrentfilter.h index ca0ab4d83f..8e789b6a81 100644 --- a/src/concurrent/qtconcurrentfilter.h +++ b/src/concurrent/qtconcurrentfilter.h @@ -53,7 +53,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifdef qdoc +#ifdef Q_QDOC namespace QtConcurrent { @@ -258,7 +258,7 @@ OutputSequence blockingFiltered(Iterator begin, Iterator end, KeepFunctor keep) } // namespace QtConcurrent -#endif // qdoc +#endif // Q_QDOC QT_END_NAMESPACE QT_END_HEADER diff --git a/src/concurrent/qtconcurrentfilterkernel.h b/src/concurrent/qtconcurrentfilterkernel.h index c980fcc477..3779339d3e 100644 --- a/src/concurrent/qtconcurrentfilterkernel.h +++ b/src/concurrent/qtconcurrentfilterkernel.h @@ -54,7 +54,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -340,7 +340,7 @@ inline ThreadEngineStarter<ResultType> startFilteredReduced(Iterator begin, Iter } // namespace QtConcurrent -#endif // qdoc +#endif // Q_QDOC QT_END_NAMESPACE QT_END_HEADER diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index 734aa2a06d..3e34e38e67 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -51,7 +51,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -294,7 +294,7 @@ struct MapResultType<QStringList, U(C::*)() const> } // namespace QtPrivate. -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE QT_END_HEADER diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index 5d899b5ca6..d9f1575cc4 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -56,7 +56,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -300,7 +300,7 @@ public: } // namespace QtConcurrent -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE QT_END_HEADER diff --git a/src/concurrent/qtconcurrentmap.h b/src/concurrent/qtconcurrentmap.h index 3c2f0df56b..0153aa6c9b 100644 --- a/src/concurrent/qtconcurrentmap.h +++ b/src/concurrent/qtconcurrentmap.h @@ -55,7 +55,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifdef qdoc +#ifdef Q_QDOC namespace QtConcurrent { @@ -309,7 +309,7 @@ typename QtPrivate::MapResultType<Iterator, MapFunctor>::ResultType blockingMapp } // namespace QtConcurrent -#endif // qdoc +#endif // Q_QDOC QT_END_NAMESPACE QT_END_HEADER diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h index e6d7493d53..42c8b061b4 100644 --- a/src/concurrent/qtconcurrentmapkernel.h +++ b/src/concurrent/qtconcurrentmapkernel.h @@ -53,7 +53,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { // map kernel, works with both parallel-for and parallel-while @@ -262,7 +262,7 @@ inline ThreadEngineStarter<ResultType> startMappedReduced(Iterator begin, Iterat } // namespace QtConcurrent -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE QT_END_HEADER diff --git a/src/concurrent/qtconcurrentmedian.h b/src/concurrent/qtconcurrentmedian.h index 92bcae8393..c947dfd26b 100644 --- a/src/concurrent/qtconcurrentmedian.h +++ b/src/concurrent/qtconcurrentmedian.h @@ -53,7 +53,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -119,7 +119,7 @@ private: } // namespace QtConcurrent -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE QT_END_HEADER 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 diff --git a/src/concurrent/qtconcurrentrun.h b/src/concurrent/qtconcurrentrun.h index 452c869948..0c173d267c 100644 --- a/src/concurrent/qtconcurrentrun.h +++ b/src/concurrent/qtconcurrentrun.h @@ -54,7 +54,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifdef qdoc +#ifdef Q_QDOC namespace QtConcurrent { @@ -337,7 +337,7 @@ QFuture<T> run(const Class *object, T (Class::*fn)(Param1, Param2, Param3, Param } //namespace QtConcurrent -#endif // qdoc +#endif // Q_QDOC QT_END_NAMESPACE QT_END_HEADER diff --git a/src/concurrent/qtconcurrentrunbase.h b/src/concurrent/qtconcurrentrunbase.h index 6c67338d25..9dc88371f2 100644 --- a/src/concurrent/qtconcurrentrunbase.h +++ b/src/concurrent/qtconcurrentrunbase.h @@ -54,7 +54,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -144,7 +144,7 @@ public: } //namespace QtConcurrent -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE QT_END_HEADER diff --git a/src/concurrent/qtconcurrentstoredfunctioncall.h b/src/concurrent/qtconcurrentstoredfunctioncall.h index ffddb307cb..a20c0c14ce 100644 --- a/src/concurrent/qtconcurrentstoredfunctioncall.h +++ b/src/concurrent/qtconcurrentstoredfunctioncall.h @@ -52,7 +52,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { template <typename T, typename FunctionPointer> @@ -1302,7 +1302,7 @@ private: } //namespace QtConcurrent -#endif // qdoc +#endif // Q_QDOC QT_END_NAMESPACE QT_END_HEADER diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h index ee3f7e6bd6..daccabd3a6 100644 --- a/src/concurrent/qtconcurrentthreadengine.h +++ b/src/concurrent/qtconcurrentthreadengine.h @@ -58,7 +58,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -270,7 +270,7 @@ inline ThreadEngineStarter<typename ThreadEngine::ResultType> startThreadEngine( } // namespace QtConcurrent -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE QT_END_HEADER |