[Development] Header diff for QtConcurrent

Wed Jun 26 22:55:33 CEST 2013

Nothing to see here :)

Lars

On 6/26/13 10:49 PM, "Thiago Macieira" <thiago.macieira at intel.com> wrote:

>diff --git a/src/concurrent/qtconcurrent_global.h
>b/src/concurrent/qtconcurrent_global.h
>index 464aa88..965d33f 100644
>--- a/src/concurrent/qtconcurrent_global.h
>+++ b/src/concurrent/qtconcurrent_global.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -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 0b0edf5..7652a69 100644
>--- a/src/concurrent/qtconcurrentcompilertest.h
>+++ b/src/concurrent/qtconcurrentcompilertest.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -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 373d42e..21fdb25 100644
>--- a/src/concurrent/qtconcurrentexception.h
>+++ b/src/concurrent/qtconcurrentexception.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -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 ca0ab4d..4c6f2ed 100644
>--- a/src/concurrent/qtconcurrentfilter.h
>+++ b/src/concurrent/qtconcurrentfilter.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -49,11 +49,10 @@
> #include <QtConcurrent/qtconcurrentfilterkernel.h>
> #include <QtConcurrent/qtconcurrentfunctionwrappers.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifdef qdoc
>+#ifdef Q_QDOC
> 
> namespace QtConcurrent {
> 
>@@ -258,10 +257,9 @@ OutputSequence blockingFiltered(Iterator begin,
>Iterator end, KeepFunctor keep)
> 
> } // namespace QtConcurrent
> 
>-#endif // qdoc
>+#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 c980fcc..63e77ab 100644
>--- a/src/concurrent/qtconcurrentfilterkernel.h
>+++ b/src/concurrent/qtconcurrentfilterkernel.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -50,11 +50,10 @@
> #include <QtConcurrent/qtconcurrentmapkernel.h>
> #include <QtConcurrent/qtconcurrentreducekernel.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifndef qdoc
>+#ifndef Q_QDOC
> 
> namespace QtConcurrent {
> 
>@@ -340,10 +339,9 @@ inline ThreadEngineStarter<ResultType>
>startFilteredReduced(Iterator begin, Iter
> 
> } // namespace QtConcurrent
> 
>-#endif // qdoc
>+#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 59a29d4..abd316b 100644
>--- a/src/concurrent/qtconcurrentfunctionwrappers.h
>+++ b/src/concurrent/qtconcurrentfunctionwrappers.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -43,14 +43,14 @@
> #define QTCONCURRENT_FUNCTIONWRAPPERS_H
> 
> #include <QtConcurrent/qtconcurrentcompilertest.h>
>+#include <QtCore/QStringList>
> 
> #ifndef QT_NO_CONCURRENT
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifndef qdoc
>+#ifndef Q_QDOC
> 
> namespace QtConcurrent {
> 
>@@ -293,10 +293,9 @@ struct MapResultType<QStringList, U(C::*)() const>
> 
> } // namespace QtPrivate.
> 
>-#endif //qdoc
>+#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 5d899b5..70a7f16 100644
>--- a/src/concurrent/qtconcurrentiteratekernel.h
>+++ b/src/concurrent/qtconcurrentiteratekernel.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -52,11 +52,10 @@
> 
> #include <iterator>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifndef qdoc
>+#ifndef Q_QDOC
> 
> namespace QtConcurrent {
> 
>@@ -300,10 +299,9 @@ public:
> 
> } // namespace QtConcurrent
> 
>-#endif //qdoc
>+#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 3c2f0df..bc1c363 100644
>--- a/src/concurrent/qtconcurrentmap.h
>+++ b/src/concurrent/qtconcurrentmap.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -51,11 +51,10 @@
> #include <QtConcurrent/qtconcurrentfunctionwrappers.h>
> #include <QtCore/qstringlist.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifdef qdoc
>+#ifdef Q_QDOC
> 
> namespace QtConcurrent {
> 
>@@ -309,10 +308,9 @@ typename QtPrivate::MapResultType<Iterator,
>MapFunctor>::ResultType blockingMapp
> 
> } // namespace QtConcurrent
> 
>-#endif // qdoc
>+#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 e6d7493..6817cd3 100644
>--- a/src/concurrent/qtconcurrentmapkernel.h
>+++ b/src/concurrent/qtconcurrentmapkernel.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -49,11 +49,10 @@
> #include <QtConcurrent/qtconcurrentiteratekernel.h>
> #include <QtConcurrent/qtconcurrentreducekernel.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifndef qdoc
>+#ifndef Q_QDOC
> namespace QtConcurrent {
> 
> // map kernel, works with both parallel-for and parallel-while
>@@ -81,7 +80,7 @@ public:
>             runIteration(it, i, 0);
>             advance(it, 1);
>         }
>-       
>+
>         return false;
>     }
> };
>@@ -262,10 +261,9 @@ inline ThreadEngineStarter<ResultType>
>startMappedReduced(Iterator begin, Iterat
> 
> } // namespace QtConcurrent
> 
>-#endif //qdoc
>+#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 92bcae8..7d3b50a 100644
>--- a/src/concurrent/qtconcurrentmedian.h
>+++ b/src/concurrent/qtconcurrentmedian.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -49,11 +49,10 @@
> #include <QtCore/qvector.h>
> #include <QtCore/qalgorithms.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifndef qdoc
>+#ifndef Q_QDOC
> 
> namespace QtConcurrent {
> 
>@@ -119,10 +118,9 @@ private:
> 
> } // namespace QtConcurrent
> 
>-#endif //qdoc
>+#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 9bcc9005..dcf4b92 100644
>--- a/src/concurrent/qtconcurrentreducekernel.h
>+++ b/src/concurrent/qtconcurrentreducekernel.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -54,13 +54,12 @@
> #include <QtCore/qthreadpool.h>
> #include <QtCore/qvector.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
> namespace QtConcurrent {
> 
>-#ifndef qdoc
>+#ifndef Q_QDOC
> 
> /*
>     The ReduceQueueStartLimit and ReduceQueueThrottleLimit constants
>@@ -85,7 +84,7 @@ public:
>     QVector<T> vector;
> };
> 
>-#endif // qdoc
>+#endif // Q_QDOC
> 
> enum ReduceOption {
>     UnorderedReduce = 0x1,
>@@ -96,7 +95,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>
>@@ -140,7 +139,7 @@ class ReduceKernel
> 
> public:
>     ReduceKernel(ReduceOptions _reduceOptions)
>-        : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0),
>+        : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0),
>           threadCount(QThreadPool::globalInstance()->maxThreadCount())
>     { }
> 
>@@ -242,12 +241,11 @@ struct SequenceHolder2 : public Base
>     }
> };
> 
>-#endif //qdoc
>+#endif //Q_QDOC
> 
> } // 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 452c869..0bfe4bf 100644
>--- a/src/concurrent/qtconcurrentrun.h
>+++ b/src/concurrent/qtconcurrentrun.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -50,11 +50,10 @@
> #include <QtConcurrent/qtconcurrentrunbase.h>
> #include <QtConcurrent/qtconcurrentstoredfunctioncall.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifdef qdoc
>+#ifdef Q_QDOC
> 
> namespace QtConcurrent {
> 
>@@ -98,7 +97,7 @@ QFuture<T> run(T (*functionPointer)(Param1, Param2,
>Param3, Param4, Param5), con
>     return (new StoredFunctorCall5<T, T (*)(Param1, Param2, Param3,
>Param4, Param5), Arg1, Arg2, Arg3, Arg4, Arg5>(functionPointer, arg1,
>arg2, arg3, arg4, arg5))->start();
> }
> 
>-#ifdef Q_COMPILER_DECLTYPE
>+#if defined(Q_COMPILER_DECLTYPE) && defined(Q_COMPILER_AUTO_FUNCTION)
> 
> template <typename Functor>
> auto run(Functor functor) -> typename
>QtPrivate::QEnableIf<!QtPrivate::HasResultType<Functor>::Value,
>QFuture<decltype(functor())> >::Type
>@@ -337,10 +336,9 @@ 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
> 
> #endif // QT_NO_CONCURRENT
> 
>diff --git a/src/concurrent/qtconcurrentrunbase.h
>b/src/concurrent/qtconcurrentrunbase.h
>index 6c67338..bd24c42 100644
>--- a/src/concurrent/qtconcurrentrunbase.h
>+++ b/src/concurrent/qtconcurrentrunbase.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -50,11 +50,10 @@
> #include <QtCore/qrunnable.h>
> #include <QtCore/qthreadpool.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifndef qdoc
>+#ifndef Q_QDOC
> 
> namespace QtConcurrent {
> 
>@@ -144,10 +143,9 @@ public:
> 
> } //namespace QtConcurrent
> 
>-#endif //qdoc
>+#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 ffddb30..8d49ab3 100644
>--- a/src/concurrent/qtconcurrentstoredfunctioncall.h
>+++ b/src/concurrent/qtconcurrentstoredfunctioncall.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -48,11 +48,10 @@
> #ifndef QT_NO_CONCURRENT
> #include <QtConcurrent/qtconcurrentrunbase.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifndef qdoc
>+#ifndef Q_QDOC
> 
> namespace QtConcurrent {
> template <typename T, typename FunctionPointer>
>@@ -1302,10 +1301,9 @@ private:
> 
> } //namespace QtConcurrent
> 
>-#endif // qdoc
>+#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 ee3f7e6..a3ee8ca 100644
>--- a/src/concurrent/qtconcurrentthreadengine.h
>+++ b/src/concurrent/qtconcurrentthreadengine.h
>@@ -1,6 +1,6 @@
> 
>/*************************************************************************
>***
> **
>-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
>+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
> ** Contact: http://www.qt-project.org/legal
> **
> ** This file is part of the QtCore module of the Qt Toolkit.
>@@ -54,11 +54,10 @@
> #include <QtCore/qatomic.h>
> #include <QtCore/qsemaphore.h>
> 
>-QT_BEGIN_HEADER
> QT_BEGIN_NAMESPACE
> 
> 
>-#ifndef qdoc
>+#ifndef Q_QDOC
> 
> namespace QtConcurrent {
> 
>@@ -270,10 +269,9 @@ inline ThreadEngineStarter<typename
>ThreadEngine::ResultType> startThreadEngine(
> 
> } // namespace QtConcurrent
> 
>-#endif //qdoc
>+#endif //Q_QDOC
> 
> QT_END_NAMESPACE
>-QT_END_HEADER
> 
> #endif // QT_NO_CONCURRENT
> 
>_______________________________________________
>Development mailing list
>Development at qt-project.org
>http://lists.qt-project.org/mailman/listinfo/development