doc: Add missing template text and parameters

This update corrects many qdoc warnings in the documentation
for the QFuture classes caused by incomplete \fn commands.
Template text and parameters was added.

Change-Id: I360c9db191230b19a9b174a43468d3de1eb24549
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

4 files changed, 109 insertions, 104 deletions

diff --git a/src/corelib/thread/qfuture.h b/src/corelib/thread/qfuture.h
index 1f0c747f40..20efc3ce9f 100644
--- a/src/corelib/thread/qfuture.h
+++ b/src/corelib/thread/qfuture.h
@@ -65,6 +65,11 @@ public:
     explicit QFuture(QFutureInterface<T> *p) // internal
         : d(*p)
     { }
+#if defined(Q_CLANG_QDOC)
+    ~QFuture() { }
+    QFuture(const QFuture<T> &) { }
+    QFuture<T> & operator=(const QFuture<T> &) { }
+#endif
 
     bool operator==(const QFuture &other) const { return (d == other.d); }
     bool operator!=(const QFuture &other) const { return (d != other.d); }
diff --git a/src/corelib/thread/qfuture.qdoc b/src/corelib/thread/qfuture.qdoc
index 25306d5564..8d5b7c776c 100644
--- a/src/corelib/thread/qfuture.qdoc
+++ b/src/corelib/thread/qfuture.qdoc
@@ -93,23 +93,23 @@
     \sa QFutureWatcher, {Qt Concurrent}
 */
 
-/*! \fn QFuture::QFuture()
+/*! \fn template <typename T> QFuture<T>::QFuture()
 
     Constructs an empty, canceled future.
 */
 
-/*! \fn QFuture::QFuture(const QFuture &other)
+/*! \fn template <typename T> QFuture<T>::QFuture(const QFuture<T> &other)
 
     Constructs a copy of \a other.
 
     \sa operator=()
 */
 
-/*! \fn QFuture::QFuture(QFutureInterface<T> *resultHolder)
+/*! \fn template <typename T> QFuture<T>::QFuture(QFutureInterface<T> *resultHolder)
     \internal
 */
 
-/*! \fn QFuture::~QFuture()
+/*! \fn template <typename T> QFuture<T>::~QFuture()
 
     Destroys the future.
 
@@ -118,23 +118,23 @@
     computation is completed before the future is destroyed.
 */
 
-/*! \fn QFuture &QFuture::operator=(const QFuture &other)
+/*! \fn template <typename T> QFuture<T> &QFuture<T>::operator=(const QFuture<T> &other)
 
      Assigns \a other to this future and returns a reference to this future.
 */
 
-/*! \fn bool QFuture::operator==(const QFuture &other) const
+/*! \fn template <typename T> bool QFuture<T>::operator==(const QFuture &other) const
 
     Returns \c true if \a other is a copy of this future; otherwise returns \c false.
 */
 
-/*! \fn bool QFuture::operator!=(const QFuture &other) const
+/*! \fn template <typename T> bool QFuture<T>::operator!=(const QFuture &other) const
 
     Returns \c true if \a other is \e not a copy of this future; otherwise returns
     false.
 */
 
-/*! \fn void QFuture::cancel()
+/*! \fn template <typename T> void QFuture<T>::cancel()
 
     Cancels the asynchronous computation represented by this future. Note that
     the cancelation is asynchronous. Use waitForFinished() after calling
@@ -150,7 +150,7 @@
     but the future returned by QtConcurrent::mappedReduced() can.
 */
 
-/*! \fn bool QFuture::isCanceled() const
+/*! \fn template <typename T> bool QFuture<T>::isCanceled() const
 
     Returns \c true if the asynchronous computation has been canceled with the
     cancel() function; otherwise returns \c false.
@@ -159,7 +159,7 @@
     function returns \c true. See cancel() for more details.
 */
 
-/*! \fn void QFuture::setPaused(bool paused)
+/*! \fn template <typename T> void QFuture<T>::setPaused(bool paused)
 
     If \a paused is true, this function pauses the asynchronous computation
     represented by the future. If the computation is  already paused, this
@@ -178,7 +178,7 @@
     \sa pause(), resume(), togglePaused()
 */
 
-/*! \fn bool QFuture::isPaused() const
+/*! \fn template <typename T> bool QFuture<T>::isPaused() const
 
     Returns \c true if the asynchronous computation has been paused with the
     pause() function; otherwise returns \c false.
@@ -189,7 +189,7 @@
     \sa setPaused(), togglePaused()
 */
 
-/*! \fn void QFuture::pause()
+/*! \fn template <typename T> void QFuture<T>::pause()
 
     Pauses the asynchronous computation represented by this future. This is a
     convenience method that simply calls setPaused(true).
@@ -197,7 +197,7 @@
     \sa resume()
 */
 
-/*! \fn void QFuture::resume()
+/*! \fn template <typename T> void QFuture<T>::resume()
 
     Resumes the asynchronous computation represented by this future. This is a
     convenience method that simply calls setPaused(false).
@@ -205,7 +205,7 @@
     \sa pause()
 */
 
-/*! \fn void QFuture::togglePaused()
+/*! \fn template <typename T> void QFuture<T>::togglePaused()
 
     Toggles the paused state of the asynchronous computation. In other words,
     if the computation is currently paused, calling this function resumes it;
@@ -215,25 +215,25 @@
     \sa setPaused(), pause(), resume()
 */
 
-/*! \fn bool QFuture::isStarted() const
+/*! \fn template <typename T> bool QFuture<T>::isStarted() const
 
     Returns \c true if the asynchronous computation represented by this future
     has been started; otherwise returns \c false.
 */
 
-/*! \fn bool QFuture::isFinished() const
+/*! \fn template <typename T> bool QFuture<T>::isFinished() const
 
     Returns \c true if the asynchronous computation represented by this future
     has finished; otherwise returns \c false.
 */
 
-/*! \fn bool QFuture::isRunning() const
+/*! \fn template <typename T> bool QFuture<T>::isRunning() const
 
     Returns \c true if the asynchronous computation represented by this future is
     currently running; otherwise returns \c false.
 */
 
-/*! \fn int QFuture::resultCount() const
+/*! \fn template <typename T> int QFuture<T>::resultCount() const
 
     Returns the number of continuous results available in this future. The real
     number of results stored might be different from this value, due to gaps
@@ -242,7 +242,7 @@
     \sa result(), resultAt(), results()
 */
 
-/*! \fn int QFuture::progressValue() const
+/*! \fn template <typename T> int QFuture<T>::progressValue() const
 
     Returns the current progress value, which is between the progressMinimum()
     and progressMaximum().
@@ -250,21 +250,21 @@
     \sa progressMinimum(), progressMaximum()
 */
 
-/*! \fn int QFuture::progressMinimum() const
+/*! \fn template <typename T> int QFuture<T>::progressMinimum() const
 
     Returns the minimum progressValue().
 
     \sa progressValue(), progressMaximum()
 */
 
-/*! \fn int QFuture::progressMaximum() const
+/*! \fn template <typename T> int QFuture<T>::progressMaximum() const
 
     Returns the maximum progressValue().
 
     \sa progressValue(), progressMinimum()
 */
 
-/*! \fn QString QFuture::progressText() const
+/*! \fn template <typename T> QString QFuture<T>::progressText() const
 
     Returns the (optional) textual representation of the progress as reported
     by the asynchronous computation.
@@ -273,13 +273,13 @@
     progress, and as such, this function may return an empty string.
 */
 
-/*! \fn void QFuture::waitForFinished()
+/*! \fn template <typename T> void QFuture<T>::waitForFinished()
 
     Waits for the asynchronous computation to finish (including cancel()ed
     computations).
 */
 
-/*! \fn T QFuture::result() const
+/*! \fn template <typename T> T QFuture<T>::result() const
 
     Returns the first result in the future. If the result is not immediately
     available, this function will block and wait for the result to become
@@ -288,7 +288,7 @@
     \sa resultAt(), results()
 */
 
-/*! \fn T QFuture::resultAt(int index) const
+/*! \fn template <typename T> T QFuture<T>::resultAt(int index) const
 
     Returns the result at \a index in the future. If the result is not
     immediately available, this function will block and wait for the result to
@@ -297,7 +297,7 @@
     \sa result(), results(), resultCount()
 */
 
-/*! \fn bool QFuture::isResultReadyAt(int index) const
+/*! \fn template <typename T> bool QFuture<T>::isResultReadyAt(int index) const
 
     Returns \c true if the result at \a index is immediately available; otherwise
     returns \c false.
@@ -305,7 +305,7 @@
     \sa resultAt(), resultCount()
 */
 
-/*! \fn QFuture::operator T() const
+/*! \fn template <typename T> QFuture<T>::operator T() const
 
     Returns the first result in the future. If the result is not immediately
     available, this function will block and wait for the result to become
@@ -315,7 +315,7 @@
     \sa result(), resultAt(), results()
 */
 
-/*! \fn QList<T> QFuture::results() const
+/*! \fn template <typename T> QList<T> QFuture<T>::results() const
 
     Returns all results from the future. If the results are not immediately
     available, this function will block and wait for them to become available.
@@ -323,7 +323,7 @@
     \sa result(), resultAt(), resultCount()
 */
 
-/*! \fn QFuture::const_iterator QFuture::begin() const
+/*! \fn template <typename T> QFuture<T>::const_iterator QFuture<T>::begin() const
 
     Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first result in the
     future.
@@ -331,7 +331,7 @@
     \sa constBegin(), end()
 */
 
-/*! \fn QFuture::const_iterator QFuture::end() const
+/*! \fn template <typename T> QFuture<T>::const_iterator QFuture<T>::end() const
 
     Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary result
     after the last result in the future.
@@ -339,7 +339,7 @@
     \sa begin(), constEnd()
 */
 
-/*! \fn QFuture::const_iterator QFuture::constBegin() const
+/*! \fn template <typename T> QFuture<T>::const_iterator QFuture<T>::constBegin() const
 
     Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first result in the
     future.
@@ -347,7 +347,7 @@
     \sa begin(), constEnd()
 */
 
-/*! \fn QFuture::const_iterator QFuture::constEnd() const
+/*! \fn template <typename T> QFuture<T>::const_iterator QFuture<T>::constEnd() const
 
     Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary result
     after the last result in the future.
@@ -403,7 +403,7 @@
     Typedef for const T &. Provided for STL compatibility.
 */
 
-/*! \fn QFuture::const_iterator::const_iterator()
+/*! \fn template <typename T> QFuture<T>::const_iterator::const_iterator()
 
     Constructs an uninitialized iterator.
 
@@ -414,31 +414,31 @@
     \sa QFuture::constBegin(), QFuture::constEnd()
 */
 
-/*! \fn QFuture::const_iterator::const_iterator(QFuture const * const future, int index)
+/*! \fn template <typename T> QFuture<T>::const_iterator::const_iterator(QFuture const * const future, int index)
     \internal
 */
 
-/*! \fn QFuture::const_iterator::const_iterator(const const_iterator &other)
+/*! \fn template <typename T> QFuture<T>::const_iterator::const_iterator(const const_iterator &other)
 
     Constructs a copy of \a other.
 */
 
-/*! \fn QFuture::const_iterator &QFuture::const_iterator::operator=(const const_iterator &other)
+/*! \fn template <typename T> QFuture<T>::const_iterator &QFuture<T>::const_iterator::operator=(const const_iterator &other)
 
     Assigns \a other to this iterator.
 */
 
-/*! \fn const T &QFuture::const_iterator::operator*() const
+/*! \fn template <typename T> const T &QFuture<T>::const_iterator::operator*() const
 
     Returns the current result.
 */
 
-/*! \fn const T *QFuture::const_iterator::operator->() const
+/*! \fn template <typename T> const T *QFuture<T>::const_iterator::operator->() const
 
     Returns a pointer to the current result.
 */
 
-/*! \fn bool QFuture::const_iterator::operator!=(const const_iterator &other) const
+/*! \fn template <typename T> bool QFuture<T>::const_iterator::operator!=(const const_iterator &other) const
 
     Returns \c true if \a other points to a different result than this iterator;
     otherwise returns \c false.
@@ -446,7 +446,7 @@
     \sa operator==()
 */
 
-/*! \fn bool QFuture::const_iterator::operator==(const const_iterator &other) const
+/*! \fn template <typename T> bool QFuture<T>::const_iterator::operator==(const const_iterator &other) const
 
     Returns \c true if \a other points to the same result as this iterator;
     otherwise returns \c false.
@@ -454,17 +454,17 @@
     \sa operator!=()
 */
 
-/*! \fn QFuture::const_iterator &QFuture::const_iterator::operator++()
+/*! \fn template <typename T> QFuture<T>::const_iterator &QFuture<T>::const_iterator::operator++()
 
     The prefix ++ operator (\c{++it}) advances the iterator to the next result
     in the future and returns an iterator to the new current result.
 
-    Calling this function on QFuture::constEnd() leads to undefined results.
+    Calling this function on QFuture<T>::constEnd() leads to undefined results.
 
     \sa operator--()
 */
 
-/*! \fn QFuture::const_iterator QFuture::const_iterator::operator++(int)
+/*! \fn template <typename T> QFuture<T>::const_iterator QFuture<T>::const_iterator::operator++(int)
 
     \overload
 
@@ -473,17 +473,17 @@
     result.
 */
 
-/*! \fn QFuture::const_iterator &QFuture::const_iterator::operator--()
+/*! \fn template <typename T> QFuture<T>::const_iterator &QFuture<T>::const_iterator::operator--()
 
     The prefix -- operator (\c{--it}) makes the preceding result current and
     returns an iterator to the new current result.
 
-    Calling this function on QFuture::constBegin() leads to undefined results.
+    Calling this function on QFuture<T>::constBegin() leads to undefined results.
 
     \sa operator++()
 */
 
-/*! \fn QFuture::const_iterator QFuture::const_iterator::operator--(int)
+/*! \fn template <typename T> QFuture<T>::const_iterator QFuture<T>::const_iterator::operator--(int)
 
     \overload
 
@@ -491,7 +491,7 @@
     returns an iterator to the previously current result.
 */
 
-/*! \fn QFuture::const_iterator &QFuture::const_iterator::operator+=(int j)
+/*! \fn template <typename T> QFuture<T>::const_iterator &QFuture<T>::const_iterator::operator+=(int j)
 
     Advances the iterator by \a j results. (If \a j is negative, the iterator
     goes backward.)
@@ -499,7 +499,7 @@
     \sa operator-=(), operator+()
 */
 
-/*! \fn QFuture::const_iterator &QFuture::const_iterator::operator-=(int j)
+/*! \fn template <typename T> QFuture<T>::const_iterator &QFuture<T>::const_iterator::operator-=(int j)
 
     Makes the iterator go back by \a j results. (If \a j is negative, the
     iterator goes forward.)
@@ -507,7 +507,7 @@
     \sa operator+=(), operator-()
 */
 
-/*! \fn QFuture::const_iterator QFuture::const_iterator::operator+(int j) const
+/*! \fn template <typename T> QFuture<T>::const_iterator QFuture<T>::const_iterator::operator+(int j) const
 
     Returns an iterator to the results at \a j positions forward from this
     iterator. (If \a j is negative, the iterator goes backward.)
@@ -515,7 +515,7 @@
     \sa operator-(), operator+=()
 */
 
-/*! \fn QFuture::const_iterator QFuture::const_iterator::operator-(int j) const
+/*! \fn template <typename T> QFuture<T>::const_iterator QFuture<T>::const_iterator::operator-(int j) const
 
     Returns an iterator to the result at \a j positions backward from this
     iterator. (If \a j is negative, the iterator goes forward.)
@@ -582,7 +582,7 @@
 */
 
 /*!
-    \fn QFutureIterator::QFutureIterator(const QFuture<T> &future)
+    \fn template <typename T> QFutureIterator<T>::QFutureIterator(const QFuture<T> &future)
 
     Constructs an iterator for traversing \a future. The iterator is set to be
     at the front of the result list (before the first result).
@@ -590,7 +590,7 @@
     \sa operator=()
 */
 
-/*! \fn QFutureIterator &QFutureIterator::operator=(const QFuture<T> &future)
+/*! \fn template <typename T> QFutureIterator &QFutureIterator<T>::operator=(const QFuture<T> &future)
 
     Makes the iterator operate on \a future. The iterator is set to be at the
     front of the result list (before the first result).
@@ -598,7 +598,7 @@
     \sa toFront(), toBack()
 */
 
-/*! \fn void QFutureIterator::toFront()
+/*! \fn template <typename T> void QFutureIterator<T>::toFront()
 
     Moves the iterator to the front of the result list (before the first
     result).
@@ -606,14 +606,14 @@
     \sa toBack(), next()
 */
 
-/*! \fn void QFutureIterator::toBack()
+/*! \fn template <typename T> void QFutureIterator<T>::toBack()
 
     Moves the iterator to the back of the result list (after the last result).
 
     \sa toFront(), previous()
 */
 
-/*! \fn bool QFutureIterator::hasNext() const
+/*! \fn template <typename T> bool QFutureIterator<T>::hasNext() const
 
     Returns \c true if there is at least one result ahead of the iterator, e.g.,
     the iterator is \e not at the back of the result list; otherwise returns
@@ -622,7 +622,7 @@
     \sa hasPrevious(), next()
 */
 
-/*! \fn const T &QFutureIterator::next()
+/*! \fn template <typename T> const T &QFutureIterator<T>::next()
 
     Returns the next result and advances the iterator by one position.
 
@@ -632,7 +632,7 @@
     \sa hasNext(), peekNext(), previous()
 */
 
-/*! \fn const T &QFutureIterator::peekNext() const
+/*! \fn template <typename T> const T &QFutureIterator<T>::peekNext() const
 
     Returns the next result without moving the iterator.
 
@@ -642,7 +642,7 @@
     \sa hasNext(), next(), peekPrevious()
 */
 
-/*! \fn bool QFutureIterator::hasPrevious() const
+/*! \fn template <typename T> bool QFutureIterator<T>::hasPrevious() const
 
     Returns \c true if there is at least one result ahead of the iterator, e.g.,
     the iterator is \e not at the front of the result list; otherwise returns
@@ -651,7 +651,7 @@
     \sa hasNext(), previous()
 */
 
-/*! \fn const T &QFutureIterator::previous()
+/*! \fn template <typename T> const T &QFutureIterator<T>::previous()
 
     Returns the previous result and moves the iterator back by one position.
 
@@ -661,7 +661,7 @@
     \sa hasPrevious(), peekPrevious(), next()
 */
 
-/*! \fn const T &QFutureIterator::peekPrevious() const
+/*! \fn template <typename T> const T &QFutureIterator<T>::peekPrevious() const
 
     Returns the previous result without moving the iterator.
 
@@ -671,7 +671,7 @@
     \sa hasPrevious(), previous(), peekNext()
 */
 
-/*! \fn bool QFutureIterator::findNext(const T &value)
+/*! \fn template <typename T> bool QFutureIterator<T>::findNext(const T &value)
 
     Searches for \a value starting from the current iterator position forward.
     Returns \c true if \a value is found; otherwise returns \c false.
@@ -683,7 +683,7 @@
     \sa findPrevious()
 */
 
-/*! \fn bool QFutureIterator::findPrevious(const T &value)
+/*! \fn template <typename T> bool QFutureIterator<T>::findPrevious(const T &value)
 
     Searches for \a value starting from the current iterator position
     backward. Returns \c true if \a value is found; otherwise returns \c false.
diff --git a/src/corelib/thread/qfuturesynchronizer.qdoc b/src/corelib/thread/qfuturesynchronizer.qdoc
index 580eae6982..c9c402ff87 100644
--- a/src/corelib/thread/qfuturesynchronizer.qdoc
+++ b/src/corelib/thread/qfuturesynchronizer.qdoc
@@ -68,13 +68,13 @@
 */
 
 /*!
-    \fn QFutureSynchronizer::QFutureSynchronizer()
+    \fn template <typename T> QFutureSynchronizer<T>::QFutureSynchronizer()
 
     Constructs a QFutureSynchronizer.
 */
 
 /*!
-    \fn QFutureSynchronizer::QFutureSynchronizer(const QFuture<T> &future)
+    \fn template <typename T> QFutureSynchronizer<T>::QFutureSynchronizer(const QFuture<T> &future)
 
     Constructs a QFutureSynchronizer and begins watching \a future by calling
     addFuture().
@@ -83,7 +83,7 @@
 */
 
 /*!
-    \fn QFutureSynchronizer::~QFutureSynchronizer()
+    \fn template <typename T> QFutureSynchronizer<T>::~QFutureSynchronizer()
 
     Calls waitForFinished() function to ensure that all futures have finished
     before destroying this QFutureSynchronizer.
@@ -92,7 +92,7 @@
 */
 
 /*!
-    \fn void QFutureSynchronizer::setFuture(const QFuture<T> &future)
+    \fn template <typename T> void QFutureSynchronizer<T>::setFuture(const QFuture<T> &future)
 
     Sets \a future to be the only future managed by this QFutureSynchronizer.
     This is a convenience function that calls waitForFinished(),
@@ -102,7 +102,7 @@
 */
 
 /*!
-    \fn void QFutureSynchronizer::addFuture(const QFuture<T> &future)
+    \fn template <typename T> void QFutureSynchronizer<T>::addFuture(const QFuture<T> &future)
 
     Adds \a future to the list of managed futures.
 
@@ -110,7 +110,7 @@
 */
 
 /*!
-    \fn void QFutureSynchronizer::waitForFinished()
+    \fn template <typename T> void QFutureSynchronizer<T>::waitForFinished()
 
     Waits for all futures to finish. If cancelOnWait() returns \c true, each
     future is canceled before waiting for them to finish.
@@ -119,7 +119,7 @@
 */
 
 /*!
-    \fn void QFutureSynchronizer::clearFutures()
+    \fn template <typename T> void QFutureSynchronizer<T>::clearFutures()
 
     Removes all managed futures from this QFutureSynchronizer.
 
@@ -127,7 +127,7 @@
 */
 
 /*!
-    \fn QList<QFuture<T> > QFutureSynchronizer::futures() const
+    \fn template <typename T> QList<QFuture<T> > QFutureSynchronizer<T>::futures() const
 
     Returns a list of all managed futures.
 
@@ -135,7 +135,7 @@
 */
 
 /*!
-    \fn void QFutureSynchronizer::setCancelOnWait(bool enabled)
+    \fn template <typename T> void QFutureSynchronizer<T>::setCancelOnWait(bool enabled)
 
     Enables or disables the cancel-on-wait feature based on the \a enabled
     argument. If \a enabled is true, the waitForFinished() function will cancel
@@ -145,7 +145,7 @@
 */
 
 /*!
-    \fn bool QFutureSynchronizer::cancelOnWait() const
+    \fn template <typename T> bool QFutureSynchronizer<T>::cancelOnWait() const
 
     Returns \c true if the cancel-on-wait feature is enabled; otherwise returns
     false. If cancel-on-wait is enabled, the waitForFinished() function will
diff --git a/src/corelib/thread/qfuturewatcher.cpp b/src/corelib/thread/qfuturewatcher.cpp
index d2ec18850f..7143936f7a 100644
--- a/src/corelib/thread/qfuturewatcher.cpp
+++ b/src/corelib/thread/qfuturewatcher.cpp
@@ -99,7 +99,7 @@ QT_BEGIN_NAMESPACE
     \sa QFuture, {Qt Concurrent}
 */
 
-/*! \fn QFutureWatcher::QFutureWatcher(QObject *parent)
+/*! \fn template <typename T> QFutureWatcher<T>::QFutureWatcher(QObject *parent)
 
     Constructs a new QFutureWatcher with the given \a parent.
 */
@@ -107,12 +107,12 @@ QFutureWatcherBase::QFutureWatcherBase(QObject *parent)
     :QObject(*new QFutureWatcherBasePrivate, parent)
 { }
 
-/*! \fn QFutureWatcher::~QFutureWatcher()
+/*! \fn template <typename T> QFutureWatcher<T>::~QFutureWatcher()
 
     Destroys the QFutureWatcher.
 */
 
-/*! \fn void QFutureWatcher::cancel()
+/*! \fn template <typename T> void QFutureWatcher<T>::cancel()
 
     Cancels the asynchronous computation represented by the future(). Note that
     the cancelation is asynchronous. Use waitForFinished() after calling
@@ -134,7 +134,7 @@ void QFutureWatcherBase::cancel()
     futureInterface().cancel();
 }
 
-/*! \fn void QFutureWatcher::setPaused(bool paused)
+/*! \fn template <typename T> void QFutureWatcher<T>::setPaused(bool paused)
 
     If \a paused is true, this function pauses the asynchronous computation
     represented by the future(). If the computation is already paused, this
@@ -156,7 +156,7 @@ void QFutureWatcherBase::setPaused(bool paused)
     futureInterface().setPaused(paused);
 }
 
-/*! \fn void QFutureWatcher::pause()
+/*! \fn template <typename T> void QFutureWatcher<T>::pause()
 
     Pauses the asynchronous computation represented by the future(). This is a
     convenience method that simply calls setPaused(true).
@@ -168,7 +168,7 @@ void QFutureWatcherBase::pause()
     futureInterface().setPaused(true);
 }
 
-/*! \fn void QFutureWatcher::resume()
+/*! \fn template <typename T> void QFutureWatcher<T>::resume()
 
     Resumes the asynchronous computation represented by the future(). This is
     a convenience method that simply calls setPaused(false).
@@ -180,7 +180,7 @@ void QFutureWatcherBase::resume()
     futureInterface().setPaused(false);
 }
 
-/*! \fn void QFutureWatcher::togglePaused()
+/*! \fn template <typename T> void QFutureWatcher<T>::togglePaused()
 
     Toggles the paused state of the asynchronous computation. In other words,
     if the computation is currently paused, calling this function resumes it;
@@ -194,7 +194,7 @@ void QFutureWatcherBase::togglePaused()
     futureInterface().togglePaused();
 }
 
-/*! \fn int QFutureWatcher::progressValue() const
+/*! \fn template <typename T> int QFutureWatcher<T>::progressValue() const
 
     Returns the current progress value, which is between the progressMinimum()
     and progressMaximum().
@@ -206,7 +206,7 @@ int QFutureWatcherBase::progressValue() const
     return futureInterface().progressValue();
 }
 
-/*! \fn int QFutureWatcher::progressMinimum() const
+/*! \fn template <typename T> int QFutureWatcher<T>::progressMinimum() const
 
     Returns the minimum progressValue().
 
@@ -217,7 +217,7 @@ int QFutureWatcherBase::progressMinimum() const
     return futureInterface().progressMinimum();
 }
 
-/*! \fn int QFutureWatcher::progressMaximum() const
+/*! \fn template <typename T> int QFutureWatcher<T>::progressMaximum() const
 
     Returns the maximum progressValue().
 
@@ -228,7 +228,7 @@ int QFutureWatcherBase::progressMaximum() const
     return futureInterface().progressMaximum();
 }
 
-/*! \fn QString QFutureWatcher::progressText() const
+/*! \fn template <typename T> QString QFutureWatcher<T>::progressText() const
 
     Returns the (optional) textual representation of the progress as reported
     by the asynchronous computation.
@@ -241,7 +241,7 @@ QString QFutureWatcherBase::progressText() const
     return futureInterface().progressText();
 }
 
-/*! \fn bool QFutureWatcher::isStarted() const
+/*! \fn template <typename T> bool QFutureWatcher<T>::isStarted() const
 
     Returns \c true if the asynchronous computation represented by the future()
     has been started; otherwise returns \c false.
@@ -251,7 +251,7 @@ bool QFutureWatcherBase::isStarted() const
     return futureInterface().queryState(QFutureInterfaceBase::Started);
 }
 
-/*! \fn bool QFutureWatcher::isFinished() const
+/*! \fn template <typename T> bool QFutureWatcher<T>::isFinished() const
 
     Returns \c true if the asynchronous computation represented by the future()
     has finished, or if no future has been set; otherwise returns \c false.
@@ -262,7 +262,7 @@ bool QFutureWatcherBase::isFinished() const
     return d->finished;
 }
 
-/*! \fn bool QFutureWatcher::isRunning() const
+/*! \fn template <typename T> bool QFutureWatcher<T>::isRunning() const
 
     Returns \c true if the asynchronous computation represented by the future()
     is currently running; otherwise returns \c false.
@@ -272,7 +272,7 @@ bool QFutureWatcherBase::isRunning() const
     return futureInterface().queryState(QFutureInterfaceBase::Running);
 }
 
-/*! \fn bool QFutureWatcher::isCanceled() const
+/*! \fn template <typename T> bool QFutureWatcher<T>::isCanceled() const
 
     Returns \c true if the asynchronous computation has been canceled with the
     cancel() function; otherwise returns \c false.
@@ -285,7 +285,7 @@ bool QFutureWatcherBase::isCanceled() const
     return futureInterface().queryState(QFutureInterfaceBase::Canceled);
 }
 
-/*! \fn bool QFutureWatcher::isPaused() const
+/*! \fn template <typename T> bool QFutureWatcher<T>::isPaused() const
 
     Returns \c true if the asynchronous computation has been paused with the
     pause() function; otherwise returns \c false.
@@ -300,7 +300,7 @@ bool QFutureWatcherBase::isPaused() const
     return futureInterface().queryState(QFutureInterfaceBase::Paused);
 }
 
-/*! \fn void QFutureWatcher::waitForFinished()
+/*! \fn template <typename T> void QFutureWatcher<T>::waitForFinished()
 
     Waits for the asynchronous computation to finish (including cancel()ed
     computations).
@@ -339,7 +339,7 @@ bool QFutureWatcherBase::event(QEvent *event)
     return QObject::event(event);
 }
 
-/*! \fn void QFutureWatcher::setPendingResultsLimit(int limit)
+/*! \fn template <typename T> void QFutureWatcher<T>::setPendingResultsLimit(int limit)
 
     The setPendingResultsLimit() provides throttling control. When the number
     of pending resultReadyAt() or resultsReadyAt() signals exceeds the
@@ -490,7 +490,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
 }
 
 
-/*! \fn const T &QFutureWatcher::result() const
+/*! \fn template <typename T> const T &QFutureWatcher<T>::result() const
 
     Returns the first result in the future(). If the result is not immediately
     available, this function will block and wait for the result to become
@@ -499,7 +499,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
     \sa resultAt()
 */
 
-/*! \fn const T &QFutureWatcher::resultAt(int index) const
+/*! \fn template <typename T> const T &QFutureWatcher<T>::resultAt(int index) const
 
     Returns the result at \a index in the future(). If the result is not
     immediately available, this function will block and wait for the result to
@@ -508,7 +508,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
     \sa result()
 */
 
-/*! \fn void QFutureWatcher::setFuture(const QFuture<T> &future)
+/*! \fn template <typename T> void QFutureWatcher<T>::setFuture(const QFuture<T> &future)
 
     Starts watching the given \a future.
 
@@ -520,44 +520,44 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
     \e after doing the connections.
 */
 
-/*! \fn QFuture<T> QFutureWatcher::future() const
+/*! \fn template <typename T> QFuture<T> QFutureWatcher<T>::future() const
 
     Returns the watched future.
 */
 
-/*! \fn void QFutureWatcher::started()
+/*! \fn template <typename T> void QFutureWatcher<T>::started()
 
     This signal is emitted when this QFutureWatcher starts watching the future
     set with setFuture().
 */
 
 /*!
-    \fn void QFutureWatcher::finished()
+    \fn template <typename T> void QFutureWatcher<T>::finished()
     This signal is emitted when the watched future finishes.
 */
 
 /*!
-    \fn void QFutureWatcher::canceled()
+    \fn template <typename T> void QFutureWatcher<T>::canceled()
     This signal is emitted if the watched future is canceled.
 */
 
-/*! \fn void QFutureWatcher::paused()
+/*! \fn template <typename T> void QFutureWatcher<T>::paused()
     This signal is emitted when the watched future is paused.
 */
 
-/*! \fn void QFutureWatcher::resumed()
+/*! \fn template <typename T> void QFutureWatcher<T>::resumed()
     This signal is emitted when the watched future is resumed.
 */
 
 /*!
-    \fn void QFutureWatcher::progressRangeChanged(int minimum, int maximum)
+    \fn template <typename T> void QFutureWatcher<T>::progressRangeChanged(int minimum, int maximum)
 
     The progress range for the watched future has changed to \a minimum and
     \a maximum
 */
 
 /*!
-    \fn void QFutureWatcher::progressValueChanged(int progressValue)
+    \fn template <typename T> void QFutureWatcher<T>::progressValueChanged(int progressValue)
 
     This signal is emitted when the watched future reports progress,
     \a progressValue gives the current progress. In order to avoid overloading
@@ -567,14 +567,14 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
     \a progressValue equals the maximum value) will always be delivered.
 */
 
-/*! \fn void QFutureWatcher::progressTextChanged(const QString &progressText)
+/*! \fn template <typename T> void QFutureWatcher<T>::progressTextChanged(const QString &progressText)
 
     This signal is emitted when the watched future reports textual progress
     information, \a progressText.
 */
 
 /*!
-    \fn void QFutureWatcher::resultReadyAt(int index)
+    \fn template <typename T> void QFutureWatcher<T>::resultReadyAt(int index)
 
     This signal is emitted when the watched future reports a ready result at
     \a index. If the future reports multiple results, the index will indicate
@@ -583,7 +583,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event)
 */
 
 /*!
-    \fn void QFutureWatcher::resultsReadyAt(int beginIndex, int endIndex);
+    \fn template <typename T> void QFutureWatcher<T>::resultsReadyAt(int beginIndex, int endIndex);
 
     This signal is emitted when the watched future reports ready results.
     The results are indexed from \a beginIndex to \a endIndex.