Move QFutureSynchronizer back to QtCore

This class, too, belongs with QFuture.

Change-Id: I41a532ca66c156f1631e4b22ffc1a5879c854488
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 0 insertions, 122 deletions

diff --git a/src/concurrent/qfuturesynchronizer.h b/src/concurrent/qfuturesynchronizer.h
deleted file mode 100644
index b82e968d8f..0000000000
--- a/src/concurrent/qfuturesynchronizer.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 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.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** 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.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: 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
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QFUTURESYNCHRONIZER_H
-#define QFUTURESYNCHRONIZER_H
-
-#include <QtConcurrent/qtconcurrent_global.h>
-
-#include <QtCore/qfuture.h>
-
-#ifndef QT_NO_CONCURRENT
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-
-template <typename T>
-class QFutureSynchronizer
-{
-    Q_DISABLE_COPY(QFutureSynchronizer)
-
-public:
-    QFutureSynchronizer() : m_cancelOnWait(false) { }
-    explicit QFutureSynchronizer(const QFuture<T> &future)
-        : m_cancelOnWait(false)
-    { addFuture(future); }
-    ~QFutureSynchronizer()  { waitForFinished(); }
-
-    void setFuture(const QFuture<T> &future)
-    {
-        waitForFinished();
-        m_futures.clear();
-        addFuture(future);
-    }
-
-    void addFuture(const QFuture<T> &future)
-    {
-        m_futures.append(future);
-    }
-
-    void waitForFinished()
-    {
-        if (m_cancelOnWait) {
-            for (int i = 0; i < m_futures.count(); ++i) {
-                 m_futures[i].cancel();
-            }
-        }
-        
-        for (int i = 0; i < m_futures.count(); ++i) {
-             m_futures[i].waitForFinished();
-         }
-    }
-
-    void clearFutures()
-    {
-        m_futures.clear();
-    }
-
-    QList<QFuture<T> > futures() const
-    {
-        return m_futures;
-    }
-
-    void setCancelOnWait(bool enabled)
-    {
-        m_cancelOnWait = enabled;
-    }
-
-    bool cancelOnWait() const
-    {
-        return m_cancelOnWait;
-    }
-
-protected:
-    QList<QFuture<T> > m_futures;
-    bool m_cancelOnWait;
-};
-
-QT_END_NAMESPACE
-QT_END_HEADER
-
-#endif // QT_NO_CONCURRENT
-
-#endif // QFUTURESYNCHRONIZER_H