PySide6: Move snippets of QWebEnginePage to qtwebenginecore.cpp

The class has been moved in Qt 6.

Task-number: PYSIDE-2883
Task-number: PYSIDE-946
Change-Id: I81ededa9d4eb1fb1a03249266f48cc65c84a6b02
Reviewed-by: Shyamnath Premnadh <[email protected]>

4 files changed, 117 insertions, 114 deletions

diff --git a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml
index c68db5ece..8c3e994db 100644
--- a/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml
+++ b/sources/pyside6/PySide6/QtWebEngineCore/typesystem_webenginecore.xml
@@ -95,16 +95,20 @@
                    snippet="qwebenginepage-javascriptprompt-return"/>
     </modify-function>
     <add-function signature="findText(const QString &amp;@subString@,QWebEnginePage::FindFlags@options@,PyCallable*@resultCallback@)">
-        <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-findtext"/>
+        <inject-code class="target" position="beginning" file="../glue/qtwebenginecore.cpp"
+                     snippet="qwebenginepage-findtext"/>
     </add-function>
     <add-function signature="toPlainText(PyCallable*@resultCallback@) const">
-        <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-convertto"/>
+        <inject-code class="target" position="beginning" file="../glue/qtwebenginecore.cpp"
+                     snippet="qwebenginepage-convertto"/>
     </add-function>
     <add-function signature="toHtml(PyCallable*@resultCallback@) const">
-        <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-convertto"/>
+        <inject-code class="target" position="beginning" file="../glue/qtwebenginecore.cpp"
+                     snippet="qwebenginepage-convertto"/>
     </add-function>
     <add-function signature="runJavaScript(const QString &amp;@scriptSource@,quint32@worldId@,PyCallable*@resultCallback@)">
-        <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-runjavascript"/>
+        <inject-code class="target" position="beginning" file="../glue/qtwebenginecore.cpp"
+                     snippet="qwebenginepage-runjavascript"/>
     </add-function>
   </object-type>
 
diff --git a/sources/pyside6/PySide6/QtWebEngineWidgets/typesystem_webenginewidgets.xml b/sources/pyside6/PySide6/QtWebEngineWidgets/typesystem_webenginewidgets.xml
index 811523587..206efb68e 100644
--- a/sources/pyside6/PySide6/QtWebEngineWidgets/typesystem_webenginewidgets.xml
+++ b/sources/pyside6/PySide6/QtWebEngineWidgets/typesystem_webenginewidgets.xml
@@ -14,7 +14,8 @@
 
   <object-type name="QWebEngineView">
       <add-function signature="findText(const QString &amp;@subString@,QWebEnginePage::FindFlags@options@,PyCallable*@resultCallback@)">
-          <inject-code class="target" position="beginning" file="../glue/qtwebenginewidgets.cpp" snippet="qwebenginepage-findtext"/>
+          <inject-code class="target" position="beginning" file="../glue/qtwebenginecore.cpp"
+                       snippet="qwebenginepage-findtext"/>
       </add-function>
   </object-type>
 
diff --git a/sources/pyside6/PySide6/glue/qtwebenginecore.cpp b/sources/pyside6/PySide6/glue/qtwebenginecore.cpp
index 76a7c6d73..4638ed2cc 100644
--- a/sources/pyside6/PySide6/glue/qtwebenginecore.cpp
+++ b/sources/pyside6/PySide6/glue/qtwebenginecore.cpp
@@ -62,3 +62,110 @@ QString str;
 PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));
 PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](str));
 // @snippet qwebenginepage-javascriptprompt-return
+
+// @snippet qwebenginepage-findtext
+auto callable = %PYARG_3;
+auto callback = [callable](const QWebEngineFindTextResult &result)
+{
+    Shiboken::GilState state;
+    Shiboken::AutoDecRef arglist(PyTuple_New(1));
+    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QWebEngineFindTextResult](result));
+    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+    Py_DECREF(callable);
+
+};
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(%1, %2, callback);
+// @snippet qwebenginepage-findtext
+
+// @snippet qwebenginepage-print
+auto printer = %PYARG_1;
+auto callable = %PYARG_2;
+auto callback = [printer, callable](bool succeeded)
+{
+    if (!PyCallable_Check(callable)) {
+        qWarning("Argument 2 of %FUNCTION_NAME must be a callable.");
+        return;
+    }
+    Shiboken::GilState state;
+    Shiboken::AutoDecRef arglist(PyTuple_New(1));
+    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[bool](succeeded));
+    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+    Py_DECREF(callable);
+    Py_DECREF(printer);
+
+};
+Py_INCREF(printer); // Add a reference to the printer until asynchronous printing has finished
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(%1, callback);
+// @snippet qwebenginepage-print
+
+// @snippet qwebenginepage-convertto
+auto callable = %PYARG_1;
+auto callback = [callable](const QString &text)
+{
+    Shiboken::GilState state;
+    Shiboken::AutoDecRef arglist(PyTuple_New(1));
+    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](text));
+    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+    Py_DECREF(callable);
+};
+
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(callback);
+// @snippet qwebenginepage-convertto
+
+// @snippet qwebenginepage-runjavascript
+auto callable = %PYARG_3;
+auto callback = [callable](const QVariant &result)
+{
+    Shiboken::GilState state;
+    Shiboken::AutoDecRef arglist(PyTuple_New(1));
+    switch (result.type()) {
+    case QVariant::Bool: {
+        const bool value = result.toBool();
+        PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](value));
+    }
+    break;
+    case QVariant::Int:
+    case QVariant::UInt:
+    case QVariant::LongLong:
+    case QVariant::ULongLong:
+    case QVariant::Double: {
+        const double number = result.toDouble();
+        PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[double](number));
+    }
+    break;
+    default: {
+        const QString value = result.toString();
+        PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](value));
+    }
+    break;
+    }
+    // PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[bool](found));
+    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+    Py_DECREF(callable);
+};
+
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(%1, %2, callback);
+// @snippet qwebenginepage-runjavascript
+
+// @snippet qwebenginepage-printtopdf
+auto callable = %PYARG_1;
+auto callback = [callable](const QByteArray &pdf)
+{
+    if (!PyCallable_Check(callable)) {
+        qWarning("Argument 1 of %FUNCTION_NAME must be a callable.");
+        return;
+    }
+    Shiboken::GilState state;
+    Shiboken::AutoDecRef arglist(PyTuple_New(1));
+    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QByteArray](pdf));
+    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+    Py_DECREF(callable);
+};
+
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(callback, %2);
+// @snippet qwebenginepage-printtopdf
diff --git a/sources/pyside6/PySide6/glue/qtwebenginewidgets.cpp b/sources/pyside6/PySide6/glue/qtwebenginewidgets.cpp
deleted file mode 100644
index 1235c123d..000000000
--- a/sources/pyside6/PySide6/glue/qtwebenginewidgets.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (C) 2020 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
-
-// @snippet qwebenginepage-findtext
-auto callable = %PYARG_3;
-auto callback = [callable](const QWebEngineFindTextResult &result)
-{
-    Shiboken::GilState state;
-    Shiboken::AutoDecRef arglist(PyTuple_New(1));
-    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QWebEngineFindTextResult](result));
-    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
-    Py_DECREF(callable);
-
-};
-Py_INCREF(callable);
-%CPPSELF.%FUNCTION_NAME(%1, %2, callback);
-// @snippet qwebenginepage-findtext
-
-// @snippet qwebenginepage-print
-auto printer = %PYARG_1;
-auto callable = %PYARG_2;
-auto callback = [printer, callable](bool succeeded)
-{
-    if (!PyCallable_Check(callable)) {
-        qWarning("Argument 2 of %FUNCTION_NAME must be a callable.");
-        return;
-    }
-    Shiboken::GilState state;
-    Shiboken::AutoDecRef arglist(PyTuple_New(1));
-    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[bool](succeeded));
-    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
-    Py_DECREF(callable);
-    Py_DECREF(printer);
-
-};
-Py_INCREF(printer); // Add a reference to the printer until asynchronous printing has finished
-Py_INCREF(callable);
-%CPPSELF.%FUNCTION_NAME(%1, callback);
-// @snippet qwebenginepage-print
-
-// @snippet qwebenginepage-convertto
-auto callable = %PYARG_1;
-auto callback = [callable](const QString &text)
-{
-    Shiboken::GilState state;
-    Shiboken::AutoDecRef arglist(PyTuple_New(1));
-    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](text));
-    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
-    Py_DECREF(callable);
-};
-
-Py_INCREF(callable);
-%CPPSELF.%FUNCTION_NAME(callback);
-// @snippet qwebenginepage-convertto
-
-// @snippet qwebenginepage-runjavascript
-auto callable = %PYARG_3;
-auto callback = [callable](const QVariant &result)
-{
-    Shiboken::GilState state;
-    Shiboken::AutoDecRef arglist(PyTuple_New(1));
-    switch (result.type()) {
-    case QVariant::Bool: {
-        const bool value = result.toBool();
-        PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](value));
-    }
-        break;
-     case QVariant::Int:
-     case QVariant::UInt:
-     case QVariant::LongLong:
-     case QVariant::ULongLong:
-     case QVariant::Double: {
-        const double number = result.toDouble();
-        PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[double](number));
-    }
-        break;
-    default: {
-        const QString value = result.toString();
-        PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QString](value));
-    }
-        break;
-    }
-   // PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[bool](found));
-    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
-    Py_DECREF(callable);
-};
-
-Py_INCREF(callable);
-%CPPSELF.%FUNCTION_NAME(%1, %2, callback);
-// @snippet qwebenginepage-runjavascript
-
-// @snippet qwebenginepage-printtopdf
-auto callable = %PYARG_1;
-auto callback = [callable](const QByteArray &pdf)
-{
-    if (!PyCallable_Check(callable)) {
-        qWarning("Argument 1 of %FUNCTION_NAME must be a callable.");
-        return;
-    }
-    Shiboken::GilState state;
-    Shiboken::AutoDecRef arglist(PyTuple_New(1));
-    PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QByteArray](pdf));
-    Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
-    Py_DECREF(callable);
-};
-
-Py_INCREF(callable);
-%CPPSELF.%FUNCTION_NAME(callback, %2);
-// @snippet qwebenginepage-printtopdf