diff options
Diffstat (limited to 'src/concurrent/qtconcurrentfilter.cpp')
-rw-r--r-- | src/concurrent/qtconcurrentfilter.cpp | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/src/concurrent/qtconcurrentfilter.cpp b/src/concurrent/qtconcurrentfilter.cpp index 8dddf5a1b8..4b3f2368b8 100644 --- a/src/concurrent/qtconcurrentfilter.cpp +++ b/src/concurrent/qtconcurrentfilter.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -179,6 +179,8 @@ Calls \a filterFunction once for each item in \a sequence. If \a filterFunction returns \c true, the item is kept in \a sequence; otherwise, the item is removed from \a sequence. + + \sa {Concurrent Filter and Filter-Reduce} */ /*! @@ -188,6 +190,8 @@ new Sequence of kept items. If \a filterFunction returns \c true, a copy of the item is put in the new Sequence. Otherwise, the item will \e not appear in the new Sequence. + + \sa {Concurrent Filter and Filter-Reduce} */ /*! @@ -197,6 +201,8 @@ returns a new Sequence of kept items. If \a filterFunction returns \c true, a copy of the item is put in the new Sequence. Otherwise, the item will \e not appear in the new Sequence. + + \sa {Concurrent Filter and Filter-Reduce} */ /*! @@ -213,6 +219,8 @@ QtConcurrent::UnorderedReduce. If \a reduceOptions is QtConcurrent::OrderedReduce, \a reduceFunction is called in the order of the original sequence. + + \sa {Concurrent Filter and Filter-Reduce} */ /*! @@ -229,6 +237,8 @@ QtConcurrent::UnorderedReduce. If \a reduceOptions is QtConcurrent::OrderedReduce, the \a reduceFunction is called in the order of the original sequence. + + \sa {Concurrent Filter and Filter-Reduce} */ /*! @@ -239,6 +249,8 @@ otherwise, the item is removed from \a sequence. \note This function will block until all items in the sequence have been processed. + + \sa {Concurrent Filter and Filter-Reduce} */ /*! @@ -251,7 +263,7 @@ \note This function will block until all items in the sequence have been processed. - \sa filtered() + \sa filtered(), {Concurrent Filter and Filter-Reduce} */ /*! @@ -265,7 +277,7 @@ \note This function will block until the iterator reaches the end of the sequence being processed. - \sa filtered() + \sa filtered(), {Concurrent Filter and Filter-Reduce} */ /*! @@ -285,7 +297,7 @@ \note This function will block until all items in the sequence have been processed. - \sa filteredReduced() + \sa filteredReduced(), {Concurrent Filter and Filter-Reduce} */ /*! @@ -306,5 +318,5 @@ \note This function will block until the iterator reaches the end of the sequence being processed. - \sa filteredReduced() + \sa filteredReduced(), {Concurrent Filter and Filter-Reduce} */ |