diff options
Diffstat (limited to 'src/concurrent')
-rw-r--r-- | src/concurrent/qtconcurrent_global.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentcompilertest.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentexception.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentfilter.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentfilterkernel.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentfunctionwrappers.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentiteratekernel.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentmap.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentmapkernel.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentmedian.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentreducekernel.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentrun.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentrunbase.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentstoredfunctioncall.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentthreadengine.h | 2 |
15 files changed, 0 insertions, 30 deletions
diff --git a/src/concurrent/qtconcurrent_global.h b/src/concurrent/qtconcurrent_global.h index d98319d3c0..965d33f3d9 100644 --- a/src/concurrent/qtconcurrent_global.h +++ b/src/concurrent/qtconcurrent_global.h @@ -44,7 +44,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -58,6 +57,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // include guard diff --git a/src/concurrent/qtconcurrentcompilertest.h b/src/concurrent/qtconcurrentcompilertest.h index 7b78e3a307..7652a6946f 100644 --- a/src/concurrent/qtconcurrentcompilertest.h +++ b/src/concurrent/qtconcurrentcompilertest.h @@ -46,7 +46,6 @@ #ifndef QT_NO_CONCURRENT -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE namespace QtPrivate { @@ -64,7 +63,6 @@ public: } QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentexception.h b/src/concurrent/qtconcurrentexception.h index de7f74eaef..21fdb25c2d 100644 --- a/src/concurrent/qtconcurrentexception.h +++ b/src/concurrent/qtconcurrentexception.h @@ -48,7 +48,6 @@ #include <QtCore/qexception.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -65,7 +64,6 @@ typedef Q_DECL_DEPRECATED QUnhandledException UnhandledException; } // namespace QtConcurrent QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_QFUTURE diff --git a/src/concurrent/qtconcurrentfilter.h b/src/concurrent/qtconcurrentfilter.h index cac57f6084..4c6f2ed896 100644 --- a/src/concurrent/qtconcurrentfilter.h +++ b/src/concurrent/qtconcurrentfilter.h @@ -49,7 +49,6 @@ #include <QtConcurrent/qtconcurrentfilterkernel.h> #include <QtConcurrent/qtconcurrentfunctionwrappers.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -261,7 +260,6 @@ OutputSequence blockingFiltered(Iterator begin, Iterator end, KeepFunctor keep) #endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentfilterkernel.h b/src/concurrent/qtconcurrentfilterkernel.h index 7e1555d4d8..63e77ab40d 100644 --- a/src/concurrent/qtconcurrentfilterkernel.h +++ b/src/concurrent/qtconcurrentfilterkernel.h @@ -50,7 +50,6 @@ #include <QtConcurrent/qtconcurrentmapkernel.h> #include <QtConcurrent/qtconcurrentreducekernel.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -343,7 +342,6 @@ inline ThreadEngineStarter<ResultType> startFilteredReduced(Iterator begin, Iter #endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index 3925d0eda5..abd316b7fa 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -47,7 +47,6 @@ #ifndef QT_NO_CONCURRENT -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -297,7 +296,6 @@ struct MapResultType<QStringList, U(C::*)() const> #endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index d4a6a72650..70a7f161de 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -52,7 +52,6 @@ #include <iterator> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -303,7 +302,6 @@ public: #endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentmap.h b/src/concurrent/qtconcurrentmap.h index d98ec59da3..bc1c3638d9 100644 --- a/src/concurrent/qtconcurrentmap.h +++ b/src/concurrent/qtconcurrentmap.h @@ -51,7 +51,6 @@ #include <QtConcurrent/qtconcurrentfunctionwrappers.h> #include <QtCore/qstringlist.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -312,7 +311,6 @@ typename QtPrivate::MapResultType<Iterator, MapFunctor>::ResultType blockingMapp #endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h index 2d42b24653..b456c42285 100644 --- a/src/concurrent/qtconcurrentmapkernel.h +++ b/src/concurrent/qtconcurrentmapkernel.h @@ -49,7 +49,6 @@ #include <QtConcurrent/qtconcurrentiteratekernel.h> #include <QtConcurrent/qtconcurrentreducekernel.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -265,7 +264,6 @@ inline ThreadEngineStarter<ResultType> startMappedReduced(Iterator begin, Iterat #endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentmedian.h b/src/concurrent/qtconcurrentmedian.h index e1840ed3fd..7d3b50a45b 100644 --- a/src/concurrent/qtconcurrentmedian.h +++ b/src/concurrent/qtconcurrentmedian.h @@ -49,7 +49,6 @@ #include <QtCore/qvector.h> #include <QtCore/qalgorithms.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -122,7 +121,6 @@ private: #endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h index 54bfcdeefe..a4a626d6c9 100644 --- a/src/concurrent/qtconcurrentreducekernel.h +++ b/src/concurrent/qtconcurrentreducekernel.h @@ -54,7 +54,6 @@ #include <QtCore/qthreadpool.h> #include <QtCore/qvector.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -247,7 +246,6 @@ struct SequenceHolder2 : public Base } // namespace QtConcurrent QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentrun.h b/src/concurrent/qtconcurrentrun.h index 4dadc111dd..0bfe4bfd0a 100644 --- a/src/concurrent/qtconcurrentrun.h +++ b/src/concurrent/qtconcurrentrun.h @@ -50,7 +50,6 @@ #include <QtConcurrent/qtconcurrentrunbase.h> #include <QtConcurrent/qtconcurrentstoredfunctioncall.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -340,7 +339,6 @@ QFuture<T> run(const Class *object, T (Class::*fn)(Param1, Param2, Param3, Param #endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentrunbase.h b/src/concurrent/qtconcurrentrunbase.h index e7ed6207c9..bd24c42ce2 100644 --- a/src/concurrent/qtconcurrentrunbase.h +++ b/src/concurrent/qtconcurrentrunbase.h @@ -50,7 +50,6 @@ #include <QtCore/qrunnable.h> #include <QtCore/qthreadpool.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -147,7 +146,6 @@ public: #endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentstoredfunctioncall.h b/src/concurrent/qtconcurrentstoredfunctioncall.h index aa590a3fb8..8d49ab3dfc 100644 --- a/src/concurrent/qtconcurrentstoredfunctioncall.h +++ b/src/concurrent/qtconcurrentstoredfunctioncall.h @@ -48,7 +48,6 @@ #ifndef QT_NO_CONCURRENT #include <QtConcurrent/qtconcurrentrunbase.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -1305,7 +1304,6 @@ private: #endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h index 378ee07170..a3ee8ca202 100644 --- a/src/concurrent/qtconcurrentthreadengine.h +++ b/src/concurrent/qtconcurrentthreadengine.h @@ -54,7 +54,6 @@ #include <QtCore/qatomic.h> #include <QtCore/qsemaphore.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -273,7 +272,6 @@ inline ThreadEngineStarter<typename ThreadEngine::ResultType> startThreadEngine( #endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT |