From 08c50599f149b7a8d448845dcb0b171e96342784 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Mon, 27 Aug 2012 23:15:40 +0200
Subject: Move QFutureWatcher back to QtCore

This belongs with QFuture.

Change-Id: I555cd01c1d3890fbbaca4fd8a9170292ea4eb0fb
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/concurrent/qfuturewatcher_p.h | 92 ---------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 src/concurrent/qfuturewatcher_p.h

(limited to 'src/concurrent/qfuturewatcher_p.h')

diff --git a/src/concurrent/qfuturewatcher_p.h b/src/concurrent/qfuturewatcher_p.h
deleted file mode 100644
index 23d9472cd7..0000000000
--- a/src/concurrent/qfuturewatcher_p.h
+++ /dev/null
@@ -1,92 +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 QFUTUREWATCHER_P_H
-#define QFUTUREWATCHER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtConcurrent/qtconcurrent_global.h>
-
-#include <private/qfutureinterface_p.h>
-#include <qlist.h>
-
-#ifndef QT_NO_QFUTURE
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QFutureWatcherBase;
-class QFutureWatcherBasePrivate : public QObjectPrivate,
-                                  public QFutureCallOutInterface
-{
-    Q_DECLARE_PUBLIC(QFutureWatcherBase)
-
-public:
-    QFutureWatcherBasePrivate();
-
-    void postCallOutEvent(const QFutureCallOutEvent &callOutEvent);
-    void callOutInterfaceDisconnected();
-
-    void sendCallOutEvent(QFutureCallOutEvent *event);
-
-    QList<QFutureCallOutEvent *> pendingCallOutEvents;
-    QAtomicInt pendingResultsReady;
-    int maximumPendingResultsReady;
-
-    QAtomicInt resultAtConnected;
-    bool finished;
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_QFUTURE
-#endif
-- 
cgit v1.2.3