summaryrefslogtreecommitdiffstats
path: root/src/core/api/qwebenginedownloadrequest.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/api/qwebenginedownloadrequest.h')
-rw-r--r--src/core/api/qwebenginedownloadrequest.h57
1 files changed, 9 insertions, 48 deletions
diff --git a/src/core/api/qwebenginedownloadrequest.h b/src/core/api/qwebenginedownloadrequest.h
index 38d43cf1f..36604188e 100644
--- a/src/core/api/qwebenginedownloadrequest.h
+++ b/src/core/api/qwebenginedownloadrequest.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2020 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
#ifndef QWEBENGINEDOWNLOADREQUEST_H
#define QWEBENGINEDOWNLOADREQUEST_H
@@ -43,12 +7,12 @@
#include <QtWebEngineCore/qtwebenginecoreglobal.h>
#include <QtCore/qobject.h>
-#include <QtCore/QUrl>
+#include <QtCore/qurl.h>
QT_BEGIN_NAMESPACE
-//TODO: class QWebEnginePage;
class QWebEngineDownloadRequestPrivate;
+class QWebEnginePage;
class QWebEngineProfilePrivate;
class Q_WEBENGINECORE_EXPORT QWebEngineDownloadRequest : public QObject
@@ -66,13 +30,12 @@ public:
Q_PROPERTY(bool isFinished READ isFinished NOTIFY isFinishedChanged FINAL)
Q_PROPERTY(bool isPaused READ isPaused NOTIFY isPausedChanged FINAL)
Q_PROPERTY(bool isSavePageDownload READ isSavePageDownload CONSTANT FINAL)
- //TODO: Q_PROPERTY(QQuickWebEngineView *view READ view CONSTANT REVISION 7 FINAL)
Q_PROPERTY(QUrl url READ url CONSTANT FINAL)
Q_PROPERTY(QString suggestedFileName READ suggestedFileName CONSTANT FINAL)
Q_PROPERTY(QString downloadDirectory READ downloadDirectory WRITE setDownloadDirectory NOTIFY downloadDirectoryChanged FINAL)
Q_PROPERTY(QString downloadFileName READ downloadFileName WRITE setDownloadFileName NOTIFY downloadFileNameChanged FINAL)
- ~QWebEngineDownloadRequest();
+ ~QWebEngineDownloadRequest() override;
enum DownloadState {
DownloadRequested,
@@ -141,8 +104,7 @@ public:
QString downloadFileName() const;
void setDownloadFileName(const QString &fileName);
- //TODO:
- QObject *page() const;
+ QWebEnginePage *page() const;
public Q_SLOTS:
void accept();
@@ -152,8 +114,6 @@ public Q_SLOTS:
Q_SIGNALS:
void stateChanged(QWebEngineDownloadRequest::DownloadState state);
- //TODO: fix it for qml
- void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
void savePageFormatChanged();
void receivedBytesChanged();
void totalBytesChanged();
@@ -168,8 +128,9 @@ private:
Q_DECLARE_PRIVATE(QWebEngineDownloadRequest)
friend class QWebEngineProfilePrivate;
- friend class QQuickWebEngineProfilePrivate;
- QWebEngineDownloadRequest(QWebEngineDownloadRequestPrivate*, QObject *parent = Q_NULLPTR);
+
+protected:
+ QWebEngineDownloadRequest(QWebEngineDownloadRequestPrivate *, QObject *parent = nullptr);
QScopedPointer<QWebEngineDownloadRequestPrivate> d_ptr;
};