Rename WebEngineLoadRequest to WebEngineLoadingInfo

Rename it, since it's not a real request (in a sense that there is
nothing to accept or reject), and it is also emitted on loading start
and failure.

[ChangeLog][QWebEngineQuick] WebEngineLoadRequest is renamed to
WebEngineLoadingInfo

Change-Id: I75b25da456eb4507451014070525a6a8e9d6753d
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 15 insertions, 15 deletions

diff --git a/src/webenginequick/api/qquickwebenginetestsupport.cpp b/src/webenginequick/api/qquickwebenginetestsupport.cpp
index 06798fe99..d15472291 100644
--- a/src/webenginequick/api/qquickwebenginetestsupport.cpp
+++ b/src/webenginequick/api/qquickwebenginetestsupport.cpp
@@ -39,7 +39,7 @@
 
 #include "qquickwebenginetestsupport_p.h"
 
-#include "qwebengineloadrequest.h"
+#include "qwebengineloadinginfo.h"
 
 #include <QQuickItem>
 #include <QQuickWindow>
@@ -60,14 +60,14 @@ void QQuickWebEngineErrorPage::loadFinished(bool success, const QUrl &url)
 {
     Q_UNUSED(success);
     QTimer::singleShot(0, this, [this, url]() {
-       emit loadingChanged(QWebEngineLoadRequest(url, QWebEngineLoadRequest::LoadSucceededStatus));
+       emit loadingChanged(QWebEngineLoadingInfo(url, QWebEngineLoadingInfo::LoadSucceededStatus));
     });
 }
 
 void QQuickWebEngineErrorPage::loadStarted(const QUrl &provisionalUrl)
 {
     QTimer::singleShot(0, this, [this, provisionalUrl]() {
-        emit loadingChanged(QWebEngineLoadRequest(provisionalUrl, QWebEngineLoadRequest::LoadStartedStatus));
+        emit loadingChanged(QWebEngineLoadingInfo(provisionalUrl, QWebEngineLoadingInfo::LoadStartedStatus));
     });
 }
 
diff --git a/src/webenginequick/api/qquickwebenginetestsupport_p.h b/src/webenginequick/api/qquickwebenginetestsupport_p.h
index 189643a87..0accb9b67 100644
--- a/src/webenginequick/api/qquickwebenginetestsupport_p.h
+++ b/src/webenginequick/api/qquickwebenginetestsupport_p.h
@@ -60,7 +60,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QWebEngineLoadRequest;
+class QWebEngineLoadingInfo;
 class QWindow;
 
 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineErrorPage : public QObject {
@@ -73,7 +73,7 @@ public:
     void loadStarted(const QUrl &provisionalUrl);
 
 Q_SIGNALS:
-    void loadingChanged(const QWebEngineLoadRequest &loadRequest);
+    void loadingChanged(const QWebEngineLoadingInfo &loadStatus);
 };
 
 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineTestInputContext : public QPlatformInputContext {
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index b80bead98..f457bb338 100644
--- a/src/webenginequick/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -57,7 +57,7 @@
 #include "qwebenginecertificateerror.h"
 #include "qwebenginefindtextresult.h"
 #include "qwebenginefullscreenrequest.h"
-#include "qwebengineloadrequest.h"
+#include "qwebengineloadinginfo.h"
 #include "qwebenginenavigationrequest.h"
 #include "qwebenginenewwindowrequest.h"
 #include "qwebenginequotarequest.h"
@@ -99,8 +99,8 @@
 QT_BEGIN_NAMESPACE
 using namespace QtWebEngineCore;
 
-using LoadStatus = QWebEngineLoadRequest::LoadStatus;
-using ErrorDomain = QWebEngineLoadRequest::ErrorDomain;
+using LoadStatus = QWebEngineLoadingInfo::LoadStatus;
+using ErrorDomain = QWebEngineLoadingInfo::ErrorDomain;
 Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::NoErrorDomain)          == static_cast<int>(ErrorDomain::NoErrorDomain));
 Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::InternalErrorDomain)    == static_cast<int>(ErrorDomain::InternalErrorDomain));
 Q_STATIC_ASSERT(static_cast<int>(QQuickWebEngineView::ConnectionErrorDomain)  == static_cast<int>(ErrorDomain::ConnectionErrorDomain));
@@ -470,7 +470,7 @@ void QQuickWebEngineViewPrivate::loadStarted(const QUrl &provisionalUrl, bool is
     m_history->reset();
 
     QTimer::singleShot(0, q, [q, provisionalUrl]() {
-        emit q->loadingChanged(QWebEngineLoadRequest(provisionalUrl, LoadStatus::LoadStartedStatus));
+        emit q->loadingChanged(QWebEngineLoadingInfo(provisionalUrl, LoadStatus::LoadStartedStatus));
     });
 }
 
@@ -521,13 +521,13 @@ void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, boo
     m_history->reset();
     if (errorCode == WebEngineError::UserAbortedError) {
         QTimer::singleShot(0, q, [q, url]() {
-            emit q->loadingChanged(QWebEngineLoadRequest(url, LoadStatus::LoadStoppedStatus));
+            emit q->loadingChanged(QWebEngineLoadingInfo(url, LoadStatus::LoadStoppedStatus));
         });
         return;
     }
     if (success) {
         QTimer::singleShot(0, q, [q, url, errorDescription, errorCode]() {
-            emit q->loadingChanged(QWebEngineLoadRequest(url, LoadStatus::LoadSucceededStatus, errorDescription, errorCode));
+            emit q->loadingChanged(QWebEngineLoadingInfo(url, LoadStatus::LoadSucceededStatus, errorDescription, errorCode));
         });
         return;
     }
@@ -535,7 +535,7 @@ void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, boo
     Q_ASSERT(errorCode);
     auto errorDomain = static_cast<ErrorDomain>(WebEngineError::toQtErrorDomain(errorCode));
     QTimer::singleShot(0, q, [q, url, errorDescription, errorCode, errorDomain]() {
-        emit q->loadingChanged(QWebEngineLoadRequest(url, LoadStatus::LoadFailedStatus, errorDescription, errorCode, errorDomain));
+        emit q->loadingChanged(QWebEngineLoadingInfo(url, LoadStatus::LoadFailedStatus, errorDescription, errorCode, errorDomain));
     });
     return;
 }
@@ -943,7 +943,7 @@ void QQuickWebEngineViewPrivate::initializationFinished()
     emit q->titleChanged();
     emit q->urlChanged();
     emit q->iconChanged();
-    emit q->loadingChanged(QWebEngineLoadRequest(m_url, LoadStatus::LoadSucceededStatus));
+    emit q->loadingChanged(QWebEngineLoadingInfo(m_url, LoadStatus::LoadSucceededStatus));
     emit q->loadProgressChanged();
 
     m_isBeingAdopted = false;
diff --git a/src/webenginequick/api/qquickwebengineview_p.h b/src/webenginequick/api/qquickwebengineview_p.h
index bf8b0d5e0..0ec0e91e1 100644
--- a/src/webenginequick/api/qquickwebengineview_p.h
+++ b/src/webenginequick/api/qquickwebengineview_p.h
@@ -81,7 +81,7 @@ class QWebEngineContextMenuRequest;
 class QWebEngineFindTextResult;
 class QWebEngineFullScreenRequest;
 class QWebEngineHistory;
-class QWebEngineLoadRequest;
+class QWebEngineLoadingInfo;
 class QWebEngineNavigationRequest;
 class QWebEngineNewWindowRequest;
 class QWebEngineQuotaRequest;
@@ -499,7 +499,7 @@ Q_SIGNALS:
     void titleChanged();
     void urlChanged();
     void iconChanged();
-    void loadingChanged(const QWebEngineLoadRequest &loadRequest);
+    void loadingChanged(const QWebEngineLoadingInfo &loadingInfo);
     void loadProgressChanged();
     void linkHovered(const QUrl &hoveredUrl);
     void navigationRequested(QWebEngineNavigationRequest *request);