Do comments from api 6.6 review

Additionally make destructor out of line in
qwebengineurlrequestinterceptor as it mirrors
qwebenigneurlresponeinterceptor.

Pick-to: 6.6
Change-Id: I0cdf7eae9faa671415359368560fb8f6aabf05fe
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

12 files changed, 42 insertions, 21 deletions

diff --git a/src/core/api/CMakeLists.txt b/src/core/api/CMakeLists.txt
index 564d7b382..530e3198e 100644
--- a/src/core/api/CMakeLists.txt
+++ b/src/core/api/CMakeLists.txt
@@ -33,7 +33,8 @@ qt_internal_add_module(WebEngineCore
         qwebenginescriptcollection.cpp qwebenginescriptcollection.h qwebenginescriptcollection_p.h
         qwebenginesettings.cpp qwebenginesettings.h
         qwebengineurlrequestinfo.cpp qwebengineurlrequestinfo.h qwebengineurlrequestinfo_p.h
-        qwebengineurlrequestinterceptor.h qwebengineurlresponseinterceptor.h
+        qwebengineurlrequestinterceptor.h qwebengineurlrequestinterceptor.cpp
+        qwebengineurlresponseinterceptor.h qwebengineurlresponseinterceptor.cpp
         qwebengineurlresponseinfo.cpp qwebengineurlresponseinfo.h qwebengineurlresponseinfo_p.h
         qwebengineurlrequestjob.cpp qwebengineurlrequestjob.h
         qwebengineurlscheme.cpp qwebengineurlscheme.h
diff --git a/src/core/api/qtwebenginecoreglobal.h b/src/core/api/qtwebenginecoreglobal.h
index 166a82b78..0041a72be 100644
--- a/src/core/api/qtwebenginecoreglobal.h
+++ b/src/core/api/qtwebenginecoreglobal.h
@@ -5,11 +5,12 @@
 #define QTWEBENGINECOREGLOBAL_H
 
 #include <QtCore/qglobal.h>
-#include <QtCore/qurl.h>
 #include <QtWebEngineCore/qtwebenginecore-config.h>
 
 QT_BEGIN_NAMESPACE
 
+class QUrl;
+
 #if defined(BUILDING_CHROMIUM)
 #  define Q_WEBENGINECORE_EXPORT Q_DECL_EXPORT
 #else
diff --git a/src/core/api/qwebengineglobalsettings.cpp b/src/core/api/qwebengineglobalsettings.cpp
index a12c8d2fd..b4b09e013 100644
--- a/src/core/api/qwebengineglobalsettings.cpp
+++ b/src/core/api/qwebengineglobalsettings.cpp
@@ -39,7 +39,7 @@ QWebEngineGlobalSettings::~QWebEngineGlobalSettings() { }
 
     Gets the global instance of QWebEngineGlobalSettings.
 */
-QWebEngineGlobalSettings *QWebEngineGlobalSettings::GetInstance()
+QWebEngineGlobalSettings *QWebEngineGlobalSettings::instance()
 {
     static QWebEngineGlobalSettings settings;
     return &settings;
@@ -58,7 +58,7 @@ QWebEngineGlobalSettings *QWebEngineGlobalSettings::GetInstance()
 */
 
 /*!
-    \fn QWebEngineGlobalSettings::configureDnsOverHttps(const DnsMode dnsMode,
+    \fn QWebEngineGlobalSettings::configureDnsOverHttps(DnsMode dnsMode,
                                                         const QString &dnsOverHttpsTemplates)
 
     Configures the Chromium stub host resolver, thus allowing DNS-over-HTTPS functionality.
@@ -73,7 +73,7 @@ QWebEngineGlobalSettings *QWebEngineGlobalSettings::GetInstance()
     valid \l{https://datatracker.ietf.org/doc/html/rfc6570}{URI templates} separated by
     whitespace characters. One example URI template is https://dns.google/dns-query{?dns}.
 */
-void QWebEngineGlobalSettings::configureDnsOverHttps(const DnsMode dnsMode,
+void QWebEngineGlobalSettings::configureDnsOverHttps(DnsMode dnsMode,
                                                      const QString &dnsOverHttpsTemplates)
 {
     Q_D(QWebEngineGlobalSettings);
diff --git a/src/core/api/qwebengineglobalsettings.h b/src/core/api/qwebengineglobalsettings.h
index a65a08359..cec2c136b 100644
--- a/src/core/api/qwebengineglobalsettings.h
+++ b/src/core/api/qwebengineglobalsettings.h
@@ -19,21 +19,21 @@ class QWebEngineGlobalSettingsPrivate;
 class Q_WEBENGINECORE_EXPORT QWebEngineGlobalSettings : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(QWebEngineGlobalSettings)
 public:
-    static QWebEngineGlobalSettings *GetInstance();
+    static QWebEngineGlobalSettings *instance();
 
     // Mapping net::SecureDnsMode
     enum class DnsMode { WithFallback = 1, Secure = 2 };
 
-    void configureDnsOverHttps(const DnsMode dnsMode, const QString &dnsOverHttpsTemplates);
+    void configureDnsOverHttps(DnsMode dnsMode, const QString &dnsOverHttpsTemplates);
 
 private:
     QWebEngineGlobalSettings(QObject *p = nullptr);
-    ~QWebEngineGlobalSettings();
+    ~QWebEngineGlobalSettings() override;
 
     friend class QtWebEngineCore::SystemNetworkContextManager;
     Q_DECLARE_PRIVATE(QWebEngineGlobalSettings)
+    // can't re-use base d_ptr: need to maintain compat with last Qt LTS
     QScopedPointer<QWebEngineGlobalSettingsPrivate> d_ptr;
 };
 
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp
index 0c60300e1..6eb737bda 100644
--- a/src/core/api/qwebenginepage.cpp
+++ b/src/core/api/qwebenginepage.cpp
@@ -2143,9 +2143,9 @@ void QWebEnginePage::setDevToolsPage(QWebEnginePage *devToolsPage)
    Protocol}.
 */
 
-QString QWebEnginePage::devToolsId()
+QString QWebEnginePage::devToolsId() const
 {
-    Q_D(QWebEnginePage);
+    Q_D(const QWebEnginePage);
     d->ensureInitialized();
     return d->adapter->devToolsId();
 }
diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h
index 8603d1065..7c970aabf 100644
--- a/src/core/api/qwebenginepage.h
+++ b/src/core/api/qwebenginepage.h
@@ -287,7 +287,7 @@ public:
     QWebEnginePage *inspectedPage() const;
     void setDevToolsPage(QWebEnginePage *page);
     QWebEnginePage *devToolsPage() const;
-    QString devToolsId();
+    QString devToolsId() const;
 
     void setUrlRequestInterceptor(QWebEngineUrlRequestInterceptor *interceptor);
     void setUrlResponseInterceptor(QWebEngineUrlResponseInterceptor *interceptor);
diff --git a/src/core/api/qwebengineurlrequestinterceptor.cpp b/src/core/api/qwebengineurlrequestinterceptor.cpp
new file mode 100644
index 000000000..c3cd49a5b
--- /dev/null
+++ b/src/core/api/qwebengineurlrequestinterceptor.cpp
@@ -0,0 +1,11 @@
+// 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
+
+#include "qwebengineurlrequestinterceptor.h"
+
+QT_BEGIN_NAMESPACE
+
+// Has to stay empty till Qt7
+QWebEngineUrlRequestInterceptor::~QWebEngineUrlRequestInterceptor() = default;
+
+QT_END_NAMESPACE
diff --git a/src/core/api/qwebengineurlrequestinterceptor.h b/src/core/api/qwebengineurlrequestinterceptor.h
index 98f135e73..2ca8ee914 100644
--- a/src/core/api/qwebengineurlrequestinterceptor.h
+++ b/src/core/api/qwebengineurlrequestinterceptor.h
@@ -14,10 +14,9 @@ QT_BEGIN_NAMESPACE
 class Q_WEBENGINECORE_EXPORT QWebEngineUrlRequestInterceptor : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(QWebEngineUrlRequestInterceptor)
 public:
     explicit QWebEngineUrlRequestInterceptor(QObject *p = nullptr) : QObject(p) {}
-
+    ~QWebEngineUrlRequestInterceptor() override;
     virtual void interceptRequest(QWebEngineUrlRequestInfo &info) = 0;
 };
 
diff --git a/src/core/api/qwebengineurlresponseinfo.h b/src/core/api/qwebengineurlresponseinfo.h
index c9f444768..980c25928 100644
--- a/src/core/api/qwebengineurlresponseinfo.h
+++ b/src/core/api/qwebengineurlresponseinfo.h
@@ -40,10 +40,10 @@ private:
     Q_DECLARE_PRIVATE(QWebEngineUrlResponseInfo)
     QWebEngineUrlResponseInfoPrivate *d_ptr;
 
-    QWebEngineUrlResponseInfo(const QUrl &requestUrl,
-                              const QMultiHash<QByteArray, QByteArray> &requestHeaders,
-                              const QHash<QByteArray, QByteArray> &responseHeaders,
-                              QObject *p = nullptr);
+    explicit QWebEngineUrlResponseInfo(const QUrl &requestUrl,
+                                       const QMultiHash<QByteArray, QByteArray> &requestHeaders,
+                                       const QHash<QByteArray, QByteArray> &responseHeaders,
+                                       QObject *p = nullptr);
 };
 
 QT_END_NAMESPACE
diff --git a/src/core/api/qwebengineurlresponseinterceptor.cpp b/src/core/api/qwebengineurlresponseinterceptor.cpp
new file mode 100644
index 000000000..3c9c6f36b
--- /dev/null
+++ b/src/core/api/qwebengineurlresponseinterceptor.cpp
@@ -0,0 +1,10 @@
+// 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
+
+#include "qwebengineurlresponseinterceptor.h"
+
+QT_BEGIN_NAMESPACE
+
+QWebEngineUrlResponseInterceptor::~QWebEngineUrlResponseInterceptor() = default;
+
+QT_END_NAMESPACE
diff --git a/src/core/api/qwebengineurlresponseinterceptor.h b/src/core/api/qwebengineurlresponseinterceptor.h
index 505acce57..d3526861b 100644
--- a/src/core/api/qwebengineurlresponseinterceptor.h
+++ b/src/core/api/qwebengineurlresponseinterceptor.h
@@ -15,10 +15,9 @@ class QWebEngineUrlResponseInfo;
 class Q_WEBENGINECORE_EXPORT QWebEngineUrlResponseInterceptor : public QObject
 {
     Q_OBJECT
-    Q_DISABLE_COPY(QWebEngineUrlResponseInterceptor)
 public:
     explicit QWebEngineUrlResponseInterceptor(QObject *p = nullptr) : QObject(p) { }
-
+    ~QWebEngineUrlResponseInterceptor() override;
     virtual void interceptResponseHeaders(QWebEngineUrlResponseInfo &info) = 0;
 };
 
diff --git a/src/core/net/system_network_context_manager.cpp b/src/core/net/system_network_context_manager.cpp
index 1a7b01ce8..e96af8200 100644
--- a/src/core/net/system_network_context_manager.cpp
+++ b/src/core/net/system_network_context_manager.cpp
@@ -265,7 +265,7 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(network::mojom::Networ
     // resolver of the network service here, each time it is instantiated, with our global
     // DNS-Over-HTTPS settings. This ensures that the global settings don't get lost
     // on reinstantiation and are in effect upon initial instantiation.
-    QWebEngineGlobalSettings *const globalSettings = QWebEngineGlobalSettings::GetInstance();
+    QWebEngineGlobalSettings *const globalSettings = QWebEngineGlobalSettings::instance();
     if (globalSettings->d_ptr->isDnsOverHttpsUserConfigured) {
         const bool insecureDnsClientEnabled = globalSettings->d_ptr->insecureDnsClientEnabled;
         const bool additionalInsecureDnsTypesEnabled =