Rename QWebEngineDownloadItem -> QWebEngineDownloadRequest

This fits better with other QWebEngine*Requests.

[ChangeLog] QWebEngineDownloadItem is now QWebEngineDownloadRequest,
also in qml.

Change-Id: I506e9fac746b4f23ac0936c2fbe1c7472f4fda36
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

2 files changed, 88 insertions, 88 deletions

diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index 1ffaa13da..e5f5bf27d 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -41,7 +41,7 @@
 #include <QtWebEngineCore/QWebEngineQuotaRequest>
 #include <QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest>
 #include <QtWebEngineCore/QWebEngineContextMenuRequest>
-#include <QtWebEngineCore/QWebEngineDownloadItem>
+#include <QtWebEngineCore/QWebEngineDownloadRequest>
 #include <private/qquickwebengineview_p.h>
 #include <private/qquickwebengineaction_p.h>
 #include <private/qquickwebengineclientcertificateselection_p.h>
@@ -64,7 +64,7 @@ static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *
     << &QQuickWebEngineAction::staticMetaObject
     << &QQuickWebEngineClientCertificateOption::staticMetaObject
     << &QQuickWebEngineClientCertificateSelection::staticMetaObject
-    << &QWebEngineDownloadItem::staticMetaObject
+    << &QWebEngineDownloadRequest::staticMetaObject
     << &QQuickWebEngineHistory::staticMetaObject
     << &QQuickWebEngineHistoryListModel::staticMetaObject
     << &QQuickWebEngineLoadRequest::staticMetaObject
@@ -199,69 +199,69 @@ static const QStringList expectedAPI = QStringList()
     << "QWebEngineContextMenuRequest.selectedText --> QString"
     << "QWebEngineContextMenuRequest.spellCheckerSuggestions --> QStringList"
     << "QWebEngineContextMenuRequest.position --> QPoint"
-    << "QWebEngineDownloadItem.CompleteHtmlSaveFormat --> SavePageFormat"
-    << "QWebEngineDownloadItem.DownloadCancelled --> DownloadState"
-    << "QWebEngineDownloadItem.DownloadCompleted --> DownloadState"
-    << "QWebEngineDownloadItem.DownloadInProgress --> DownloadState"
-    << "QWebEngineDownloadItem.DownloadInterrupted --> DownloadState"
-    << "QWebEngineDownloadItem.DownloadRequested --> DownloadState"
-    << "QWebEngineDownloadItem.FileAccessDenied --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.FileBlocked --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.FileFailed --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.FileHashMismatch --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.FileNameTooLong --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.FileNoSpace --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.FileSecurityCheckFailed --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.FileTooLarge --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.FileTooShort --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.FileTransientError --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.FileVirusInfected --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.MimeHtmlSaveFormat --> SavePageFormat"
-    << "QWebEngineDownloadItem.NetworkDisconnected --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.NetworkFailed --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.NetworkInvalidRequest --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.NetworkServerDown --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.NetworkTimeout --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.NoReason --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.ServerBadContent --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.ServerCertProblem --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.ServerFailed --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.ServerForbidden --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.ServerUnauthorized --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.ServerUnreachable --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.SingleHtmlSaveFormat --> SavePageFormat"
-    << "QWebEngineDownloadItem.UnknownSaveFormat --> SavePageFormat"
-    << "QWebEngineDownloadItem.UserCanceled --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.accept() --> void"
-    << "QWebEngineDownloadItem.cancel() --> void"
-    << "QWebEngineDownloadItem.id --> uint"
-    << "QWebEngineDownloadItem.interruptReason --> DownloadInterruptReason"
-    << "QWebEngineDownloadItem.interruptReasonChanged() --> void"
-    << "QWebEngineDownloadItem.interruptReasonString --> QString"
-    << "QWebEngineDownloadItem.isFinished --> bool"
-    << "QWebEngineDownloadItem.isFinishedChanged() --> void"
-    << "QWebEngineDownloadItem.isPaused --> bool"
-    << "QWebEngineDownloadItem.isPausedChanged() --> void"
-    << "QWebEngineDownloadItem.isSavePageDownload --> bool"
-    << "QWebEngineDownloadItem.mimeType --> QString"
-    << "QWebEngineDownloadItem.pause() --> void"
-    << "QWebEngineDownloadItem.receivedBytes --> qlonglong"
-    << "QWebEngineDownloadItem.receivedBytesChanged() --> void"
-    << "QWebEngineDownloadItem.resume() --> void"
-    << "QWebEngineDownloadItem.savePageFormat --> SavePageFormat"
-    << "QWebEngineDownloadItem.savePageFormatChanged() --> void"
-    << "QWebEngineDownloadItem.state --> DownloadState"
-    << "QWebEngineDownloadItem.stateChanged(QWebEngineDownloadItem::DownloadState) --> void"
-    << "QWebEngineDownloadItem.totalBytes --> qlonglong"
-    << "QWebEngineDownloadItem.totalBytesChanged() --> void"
-    // FIXME << "QWebEngineDownloadItem.view --> QQuickWebEngineView*"
-    << "QWebEngineDownloadItem.url --> QUrl"
-    << "QWebEngineDownloadItem.suggestedFileName --> QString"
-    << "QWebEngineDownloadItem.downloadDirectory --> QString"
-    << "QWebEngineDownloadItem.downloadDirectoryChanged() --> void"
-    << "QWebEngineDownloadItem.downloadFileName --> QString"
-    << "QWebEngineDownloadItem.downloadFileNameChanged() --> void"
-    << "QWebEngineDownloadItem.downloadProgress(qlonglong,qlonglong) --> void" // FIXME
+    << "QWebEngineDownloadRequest.CompleteHtmlSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadRequest.DownloadCancelled --> DownloadState"
+    << "QWebEngineDownloadRequest.DownloadCompleted --> DownloadState"
+    << "QWebEngineDownloadRequest.DownloadInProgress --> DownloadState"
+    << "QWebEngineDownloadRequest.DownloadInterrupted --> DownloadState"
+    << "QWebEngineDownloadRequest.DownloadRequested --> DownloadState"
+    << "QWebEngineDownloadRequest.FileAccessDenied --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileBlocked --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileHashMismatch --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileNameTooLong --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileNoSpace --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileSecurityCheckFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileTooLarge --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileTooShort --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileTransientError --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.FileVirusInfected --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.MimeHtmlSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadRequest.NetworkDisconnected --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.NetworkFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.NetworkInvalidRequest --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.NetworkServerDown --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.NetworkTimeout --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.NoReason --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerBadContent --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerCertProblem --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerForbidden --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerUnauthorized --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.ServerUnreachable --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.SingleHtmlSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadRequest.UnknownSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadRequest.UserCanceled --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.accept() --> void"
+    << "QWebEngineDownloadRequest.cancel() --> void"
+    << "QWebEngineDownloadRequest.id --> uint"
+    << "QWebEngineDownloadRequest.interruptReason --> DownloadInterruptReason"
+    << "QWebEngineDownloadRequest.interruptReasonChanged() --> void"
+    << "QWebEngineDownloadRequest.interruptReasonString --> QString"
+    << "QWebEngineDownloadRequest.isFinished --> bool"
+    << "QWebEngineDownloadRequest.isFinishedChanged() --> void"
+    << "QWebEngineDownloadRequest.isPaused --> bool"
+    << "QWebEngineDownloadRequest.isPausedChanged() --> void"
+    << "QWebEngineDownloadRequest.isSavePageDownload --> bool"
+    << "QWebEngineDownloadRequest.mimeType --> QString"
+    << "QWebEngineDownloadRequest.pause() --> void"
+    << "QWebEngineDownloadRequest.receivedBytes --> qlonglong"
+    << "QWebEngineDownloadRequest.receivedBytesChanged() --> void"
+    << "QWebEngineDownloadRequest.resume() --> void"
+    << "QWebEngineDownloadRequest.savePageFormat --> SavePageFormat"
+    << "QWebEngineDownloadRequest.savePageFormatChanged() --> void"
+    << "QWebEngineDownloadRequest.state --> DownloadState"
+    << "QWebEngineDownloadRequest.stateChanged(QWebEngineDownloadRequest::DownloadState) --> void"
+    << "QWebEngineDownloadRequest.totalBytes --> qlonglong"
+    << "QWebEngineDownloadRequest.totalBytesChanged() --> void"
+    // FIXME << "QWebEngineDownloadRequest.view --> QQuickWebEngineView*"
+    << "QWebEngineDownloadRequest.url --> QUrl"
+    << "QWebEngineDownloadRequest.suggestedFileName --> QString"
+    << "QWebEngineDownloadRequest.downloadDirectory --> QString"
+    << "QWebEngineDownloadRequest.downloadDirectoryChanged() --> void"
+    << "QWebEngineDownloadRequest.downloadFileName --> QString"
+    << "QWebEngineDownloadRequest.downloadFileNameChanged() --> void"
+    << "QWebEngineDownloadRequest.downloadProgress(qlonglong,qlonglong) --> void" // FIXME
     << "QQuickWebEngineFileDialogRequest.FileModeOpen --> FileMode"
     << "QQuickWebEngineFileDialogRequest.FileModeOpenMultiple --> FileMode"
     << "QQuickWebEngineFileDialogRequest.FileModeSave --> FileMode"
@@ -333,8 +333,8 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineProfile.cachePath --> QString"
     << "QQuickWebEngineProfile.cachePathChanged() --> void"
     << "QQuickWebEngineProfile.clearHttpCache() --> void"
-    << "QQuickWebEngineProfile.downloadFinished(QWebEngineDownloadItem*) --> void"
-    << "QQuickWebEngineProfile.downloadRequested(QWebEngineDownloadItem*) --> void"
+    << "QQuickWebEngineProfile.downloadFinished(QWebEngineDownloadRequest*) --> void"
+    << "QQuickWebEngineProfile.downloadRequested(QWebEngineDownloadRequest*) --> void"
     << "QQuickWebEngineProfile.downloadPath --> QString"
     << "QQuickWebEngineProfile.downloadPathChanged() --> void"
     << "QQuickWebEngineProfile.presentNotification(QWebEngineNotification*) --> void"
diff --git a/tests/auto/quick/qmltests/data/tst_download.qml b/tests/auto/quick/qmltests/data/tst_download.qml
index 1b1750dd8..8607d846d 100644
--- a/tests/auto/quick/qmltests/data/tst_download.qml
+++ b/tests/auto/quick/qmltests/data/tst_download.qml
@@ -155,7 +155,7 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1)
             compare(downloadUrl, webEngineView.url)
             compare(suggestedFileName, "download.zip")
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested)
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested)
             verify(!downloadInterruptReason)
         }
 
@@ -179,11 +179,11 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1)
             compare(downloadUrl, webEngineView.url)
             compare(suggestedFileName, "download.zip")
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested)
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress)
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested)
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress)
             downloadFinishedSpy.wait()
             compare(totalBytes, receivedBytes)
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted)
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted)
             verify(!downloadInterruptReason)
         }
 
@@ -196,8 +196,8 @@ TestWebEngineView {
             compare(downloadUrl, webEngineView.url)
             compare(suggestedFileName, "download.zip")
             compare(downloadFinishedSpy.count, 1)
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadCancelled)
-            tryCompare(webEngineView, "downloadInterruptReason", WebEngineDownloadItem.UserCanceled)
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadCancelled)
+            tryCompare(webEngineView, "downloadInterruptReason", WebEngineDownloadRequest.UserCanceled)
         }
 
         function test_downloadLocation() {
@@ -230,15 +230,15 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1);
             compare(downloadUrl, webEngineView.url);
             compare(suggestedFileName, "download.zip");
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested);
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress);
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested);
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress);
             compare(downloadedPath, testDownloadProfile.downloadPath + downloadDirectory + downloadFileName);
             compare(downloadDirectoryChanged, 1);
             compare(downloadFileNameChanged, 1);
             compare(downloadPathChanged, 2);
             downloadFinishedSpy.wait();
             compare(totalBytes, receivedBytes);
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted);
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted);
             verify(!downloadInterruptReason);
         }
 
@@ -253,15 +253,15 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1);
             compare(downloadUrl, webEngineView.url);
             compare(suggestedFileName, "download.zip");
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested);
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress);
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested);
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress);
             compare(downloadedPath, testDownloadProfile.downloadPath + downloadDirectory + "download.zip");
             compare(downloadDirectoryChanged, 1);
             compare(downloadFileNameChanged, 0);
             compare(downloadPathChanged, 1);
             downloadFinishedSpy.wait();
             compare(totalBytes, receivedBytes);
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted);
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted);
             verify(!downloadInterruptReason);
 
             // Download the same file to another directory with suggested file name.
@@ -277,15 +277,15 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1);
             compare(downloadUrl, webEngineView.url);
             compare(suggestedFileName, "download.zip");
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested);
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress);
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested);
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress);
             compare(downloadedPath, testDownloadProfile.downloadPath + downloadDirectory + "download.zip");
             compare(downloadDirectoryChanged, 1);
             compare(downloadFileNameChanged, 0);
             compare(downloadPathChanged, 1);
             downloadFinishedSpy.wait();
             compare(totalBytes, receivedBytes);
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted);
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted);
             verify(!downloadInterruptReason);
 
             // Download same file to same directory second time -> file name should be unified.
@@ -301,15 +301,15 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1);
             compare(downloadUrl, webEngineView.url);
             compare(suggestedFileName, "download.zip");
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested);
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress);
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested);
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress);
             compare(downloadedPath, testDownloadProfile.downloadPath + downloadDirectory + "download (1).zip");
             compare(downloadDirectoryChanged, 1);
             compare(downloadFileNameChanged, 1);
             compare(downloadPathChanged, 1);
             downloadFinishedSpy.wait();
             compare(totalBytes, receivedBytes);
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted);
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted);
             verify(!downloadInterruptReason);
 }
 
@@ -323,15 +323,15 @@ TestWebEngineView {
             compare(downLoadRequestedSpy.count, 1);
             compare(downloadUrl, webEngineView.url);
             compare(suggestedFileName, "download.zip");
-            compare(downloadState[0], WebEngineDownloadItem.DownloadRequested);
-            tryCompare(downloadState, "1", WebEngineDownloadItem.DownloadInProgress);
+            compare(downloadState[0], WebEngineDownloadRequest.DownloadRequested);
+            tryCompare(downloadState, "1", WebEngineDownloadRequest.DownloadInProgress);
             compare(downloadedPath, testDownloadProfile.downloadPath + downloadedSetPath);
             compare(downloadDirectoryChanged, 1);
             compare(downloadFileNameChanged, 1);
             compare(downloadPathChanged, 2);
             downloadFinishedSpy.wait();
             compare(totalBytes, receivedBytes);
-            tryCompare(downloadState, "2", WebEngineDownloadItem.DownloadCompleted);
+            tryCompare(downloadState, "2", WebEngineDownloadRequest.DownloadCompleted);
             verify(!downloadInterruptReason);
         }
     }