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>

3 files changed, 44 insertions, 45 deletions

diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt
index f320cc803..660473600 100644
--- a/src/core/api/CMakeLists.txt
+++ b/src/core/api/CMakeLists.txt
@@ -24,7 +24,7 @@ qt_internal_add_module(WebEngineCore
         qwebenginefullscreenrequest.cpp qwebenginefullscreenrequest.h
         qwebenginehistory.cpp qwebenginehistory.h qwebenginehistory_p.h
         qwebenginehttprequest.cpp qwebenginehttprequest.h
-        qwebengineloadrequest.cpp qwebengineloadrequest.h
+        qwebengineloadinginfo.cpp qwebengineloadinginfo.h
         qwebenginemessagepumpscheduler.cpp qwebenginemessagepumpscheduler_p.h
         qwebenginenavigationrequest.cpp qwebenginenavigationrequest.h
         qwebenginenewwindowrequest.cpp qwebenginenewwindowrequest.h
diff --git a/src/core/api/qwebengineloadrequest.cpp b/src/core/api/qwebengineloadinginfo.cpp
index f260e8252..fcbb2ce7a 100644
--- a/src/core/api/qwebengineloadrequest.cpp
+++ b/src/core/api/qwebengineloadinginfo.cpp
@@ -37,14 +37,14 @@
 **
 ****************************************************************************/
 
-#include <qwebengineloadrequest.h>
+#include <qwebengineloadinginfo.h>
 
 #include <web_engine_error.h>
 
 QT_BEGIN_NAMESPACE
 
-using LoadStatus = QWebEngineLoadRequest::LoadStatus;
-using ErrorDomain = QWebEngineLoadRequest::ErrorDomain;
+using LoadStatus = QWebEngineLoadingInfo::LoadStatus;
+using ErrorDomain = QWebEngineLoadingInfo::ErrorDomain;
 
 Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<int>(ErrorDomain::NoErrorDomain));
 Q_STATIC_ASSERT(static_cast<int>(WebEngineError::InternalErrorDomain) == static_cast<int>(ErrorDomain::InternalErrorDomain));
@@ -54,9 +54,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::HttpErrorDomain) == static_cast
 Q_STATIC_ASSERT(static_cast<int>(WebEngineError::FtpErrorDomain) == static_cast<int>(ErrorDomain::FtpErrorDomain));
 Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(ErrorDomain::DnsErrorDomain));
 
-class QWebEngineLoadRequest::QWebEngineLoadRequestPrivate : public QSharedData {
+class QWebEngineLoadingInfo::QWebEngineLoadingInfoPrivate : public QSharedData {
 public:
-    QWebEngineLoadRequestPrivate(const QUrl& url, LoadStatus status, const QString& errorString, int errorCode, ErrorDomain errorDomain)
+    QWebEngineLoadingInfoPrivate(const QUrl& url, LoadStatus status, const QString& errorString, int errorCode, ErrorDomain errorDomain)
         : url(url)
         , status(status)
         , errorString(errorString)
@@ -73,7 +73,7 @@ public:
 };
 
 /*!
-    \class QWebEngineLoadRequest
+    \class QWebEngineLoadingInfo
     \brief A utility type for the WebEngineView::loadingChanged signal.
     \inmodule QtWebEngineCore
     \since 6.2
@@ -83,34 +83,34 @@ public:
 
     \sa QWebEnginePage::loadStarted, QWebEnginePage::loadFinished, WebEngineView::loadingChanged
 */
-QWebEngineLoadRequest::QWebEngineLoadRequest(const QUrl& url, LoadStatus status, const QString& errorString,
+QWebEngineLoadingInfo::QWebEngineLoadingInfo(const QUrl& url, LoadStatus status, const QString& errorString,
                                            int errorCode, ErrorDomain errorDomain)
-    : d_ptr(new QWebEngineLoadRequestPrivate(url, status, errorString, errorCode, errorDomain))
+    : d_ptr(new QWebEngineLoadingInfoPrivate(url, status, errorString, errorCode, errorDomain))
 {
 }
 
-QWebEngineLoadRequest::QWebEngineLoadRequest(const QWebEngineLoadRequest &other) = default;
-QWebEngineLoadRequest& QWebEngineLoadRequest::operator=(const QWebEngineLoadRequest &other) = default;
-QWebEngineLoadRequest::QWebEngineLoadRequest(QWebEngineLoadRequest &&other) = default;
-QWebEngineLoadRequest& QWebEngineLoadRequest::operator=(QWebEngineLoadRequest &&other) = default;
+QWebEngineLoadingInfo::QWebEngineLoadingInfo(const QWebEngineLoadingInfo &other) = default;
+QWebEngineLoadingInfo& QWebEngineLoadingInfo::operator=(const QWebEngineLoadingInfo &other) = default;
+QWebEngineLoadingInfo::QWebEngineLoadingInfo(QWebEngineLoadingInfo &&other) = default;
+QWebEngineLoadingInfo& QWebEngineLoadingInfo::operator=(QWebEngineLoadingInfo &&other) = default;
 
-QWebEngineLoadRequest::~QWebEngineLoadRequest()
+QWebEngineLoadingInfo::~QWebEngineLoadingInfo()
 {
 }
 /*!
-    \property QWebEngineLoadRequest::url
+    \property QWebEngineLoadingInfo::url
     \brief Holds the URL of the load request.
 */
 /*!
     Returns the URL of the load request.
 */
-QUrl QWebEngineLoadRequest::url() const
+QUrl QWebEngineLoadingInfo::url() const
 {
-    Q_D(const QWebEngineLoadRequest);
+    Q_D(const QWebEngineLoadingInfo);
     return d->url;
 }
 /*!
-    \enum QWebEngineLoadRequest::status
+    \enum QWebEngineLoadingInfo::status
 
     This enumeration represents the load status of a web page load request:
 
@@ -127,25 +127,25 @@ QUrl QWebEngineLoadRequest::url() const
 /*!
     Returns the page's load status.
 */
-LoadStatus QWebEngineLoadRequest::status() const
+LoadStatus QWebEngineLoadingInfo::status() const
 {
-    Q_D(const QWebEngineLoadRequest);
+    Q_D(const QWebEngineLoadingInfo);
     return d->status;
 }
 /*!
-    \property QWebEngineLoadRequest::errorString
+    \property QWebEngineLoadingInfo::errorString
     \brief Holds the error message.
 */
 /*
     Returns the error message.
 */
-QString QWebEngineLoadRequest::errorString() const
+QString QWebEngineLoadingInfo::errorString() const
 {
-    Q_D(const QWebEngineLoadRequest);
+    Q_D(const QWebEngineLoadingInfo);
     return d->errorString;
 }
 /*!
-    \enum enumeration QWebEngineLoadRequest::errorDomain
+    \enum enumeration QWebEngineLoadingInfo::errorDomain
     This enumeration holds the type of a load error:
 
     \value  NoErrorDomain
@@ -164,28 +164,28 @@ QString QWebEngineLoadRequest::errorString() const
             Error is related to the DNS connection.
 */
 /*
-    \property QWebEngineLoadRequest::errorDomain
+    \property QWebEngineLoadingInfo::errorDomain
     \brief Holds the error domain
 */
 /*
     Returns the error domain.
 */
-ErrorDomain QWebEngineLoadRequest::errorDomain() const
+ErrorDomain QWebEngineLoadingInfo::errorDomain() const
 {
-    Q_D(const QWebEngineLoadRequest);
+    Q_D(const QWebEngineLoadingInfo);
     return d->errorDomain;
 }
 
 /*!
-    \property int QWebEngineLoadRequest::errorCode
+    \property int QWebEngineLoadingInfo::errorCode
     \brief Holds the error code.
 */
 /*
     Returns the error code.
 */
-int QWebEngineLoadRequest::errorCode() const
+int QWebEngineLoadingInfo::errorCode() const
 {
-    Q_D(const QWebEngineLoadRequest);
+    Q_D(const QWebEngineLoadingInfo);
     return d->errorCode;
 }
 
diff --git a/src/core/api/qwebengineloadrequest.h b/src/core/api/qwebengineloadinginfo.h
index 6520d8982..bd07d52a3 100644
--- a/src/core/api/qwebengineloadrequest.h
+++ b/src/core/api/qwebengineloadinginfo.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QWEBENGINELOADREQUEST_H
-#define QWEBENGINELOADREQUEST_H
+#ifndef QWEBENGINELOADINGINFO_H
+#define QWEBENGINELOADINGINFO_H
 
 #include <QtWebEngineCore/qtwebenginecoreglobal.h>
 
@@ -47,8 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-
-class Q_WEBENGINECORE_EXPORT QWebEngineLoadRequest
+class Q_WEBENGINECORE_EXPORT QWebEngineLoadingInfo
 {
     Q_GADGET
     Q_PROPERTY(QUrl url READ url CONSTANT FINAL)
@@ -77,11 +76,11 @@ public:
     };
     Q_ENUM(ErrorDomain)
 
-    QWebEngineLoadRequest(const QWebEngineLoadRequest &other);
-    QWebEngineLoadRequest &operator=(const QWebEngineLoadRequest &other);
-    QWebEngineLoadRequest(QWebEngineLoadRequest &&other);
-    QWebEngineLoadRequest &operator=(QWebEngineLoadRequest &&other);
-    ~QWebEngineLoadRequest();
+    QWebEngineLoadingInfo(const QWebEngineLoadingInfo &other);
+    QWebEngineLoadingInfo &operator=(const QWebEngineLoadingInfo &other);
+    QWebEngineLoadingInfo(QWebEngineLoadingInfo &&other);
+    QWebEngineLoadingInfo &operator=(QWebEngineLoadingInfo &&other);
+    ~QWebEngineLoadingInfo();
 
     QUrl url() const;
     LoadStatus status() const;
@@ -90,15 +89,15 @@ public:
     int errorCode() const;
 
 private:
-    QWebEngineLoadRequest(const QUrl& url, LoadStatus status, const QString& errorString = QString(),
-                          int errorCode = 0, ErrorDomain errorDomain = NoErrorDomain);
-    class QWebEngineLoadRequestPrivate;
-    Q_DECLARE_PRIVATE(QWebEngineLoadRequest)
-    QExplicitlySharedDataPointer<QWebEngineLoadRequestPrivate> d_ptr;
+    QWebEngineLoadingInfo(const QUrl& url, LoadStatus status, const QString& errorString = QString(),
+                       int errorCode = 0, ErrorDomain errorDomain = NoErrorDomain);
+    class QWebEngineLoadingInfoPrivate;
+    Q_DECLARE_PRIVATE(QWebEngineLoadingInfo)
+    QExplicitlySharedDataPointer<QWebEngineLoadingInfoPrivate> d_ptr;
     friend class QQuickWebEngineViewPrivate;
     friend class QQuickWebEngineErrorPage;
 };
 
 QT_END_NAMESPACE
 
-#endif // QWEBENGINELOADREQUEST_H
+#endif // QWEBENGINELOADINGINFO_H