1 files changed, 27 insertions, 34 deletions

diff --git a/examples/webenginewidgets/browser/downloadmanager.h b/examples/webenginewidgets/browser/downloadmanager.h
index 072e99efd..877682d77 100644
--- a/examples/webenginewidgets/browser/downloadmanager.h
+++ b/examples/webenginewidgets/browser/downloadmanager.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 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 demonstration applications of the Qt Toolkit.
 **
@@ -10,27 +10,27 @@
 ** 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
 ** 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
+** 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
+** 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.
 **
 ** 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
+** 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.
 **
@@ -45,12 +45,14 @@
 #include "ui_downloads.h"
 #include "ui_downloaditem.h"
 
-#include <QtNetwork/QNetworkReply>
-
-#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
 #include <QtCore/QTime>
+#include <QtCore/QUrl>
+
+#include <QWebEngineDownloadItem>
 
-class DownloadItem : public QWidget, public Ui_DownloadItem
+class DownloadManager;
+class DownloadWidget : public QWidget, public Ui_DownloadItem
 {
     Q_OBJECT
 
@@ -58,37 +60,32 @@ signals:
     void statusChanged();
 
 public:
-    DownloadItem(QNetworkReply *reply = 0, bool requestFileName = false, QWidget *parent = 0);
+    DownloadWidget(QWebEngineDownloadItem *download, QWidget *parent = 0);
     bool downloading() const;
     bool downloadedSuccessfully() const;
 
-    QUrl m_url;
-
-    QFile m_output;
-    QNetworkReply *m_reply;
+    void init();
+    bool getFileName(bool promptForFileName = false);
 
 private slots:
     void stop();
-    void tryAgain();
     void open();
 
-    void downloadReadyRead();
-    void error(QNetworkReply::NetworkError code);
     void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-    void metaDataChanged();
     void finished();
 
 private:
-    void getFileName();
-    void init();
+    friend class DownloadManager;
     void updateInfoLabel();
     QString dataString(int size) const;
 
-    QString saveFileName(const QString &directory) const;
-
-    bool m_requestFileName;
+    QUrl m_url;
+    QFileInfo m_file;
     qint64 m_bytesReceived;
     QTime m_downloadTime;
+    bool m_stopped;
+
+    QScopedPointer<QWebEngineDownloadItem> m_download;
 };
 
 class AutoSaver;
@@ -118,10 +115,7 @@ public:
     void setRemovePolicy(RemovePolicy policy);
 
 public slots:
-    void download(const QNetworkRequest &request, bool requestFileName = false);
-    inline void download(const QUrl &url, bool requestFileName = false)
-        { download(QNetworkRequest(url), requestFileName); }
-    void handleUnsupportedContent(QNetworkReply *reply, bool requestFileName = false);
+    void download(QWebEngineDownloadItem *download);
     void cleanup();
 
 private slots:
@@ -129,15 +123,14 @@ private slots:
     void updateRow();
 
 private:
-    void addItem(DownloadItem *item);
+    void addItem(DownloadWidget *item);
     void updateItemCount();
     void load();
 
     AutoSaver *m_autoSaver;
     DownloadModel *m_model;
-    QNetworkAccessManager *m_manager;
     QFileIconProvider *m_iconProvider;
-    QList<DownloadItem*> m_downloads;
+    QList<DownloadWidget*> m_downloads;
     RemovePolicy m_removePolicy;
     friend class DownloadModel;
 };