aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
diff options
context:
space:
mode:
authorCristian Maureira-Fredes <cristian.maureira-fredes@qt.io>2018-10-11 17:45:43 +0200
committerCristian Maureira-Fredes <cristian.maureira-fredes@qt.io>2018-11-22 17:00:11 +0000
commita57a202a70801f766094c3ed11664b03c9a6a3e4 (patch)
tree73c2c1f4fc902ccbc10b73811bbf299a2c555728 /sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
parentf93a7369657814206bfbce49817c8fbd9a1bfcba (diff)
Move inject-code snippets to separate files
When code must be modified or added to certain functions, we currently have two options: * Write a template and include it into the typesystem, * inject code directly at a certain place of the function entry. The problem with injecting raw code is that since it is an XML file, one need to escape protected symbols, like "<" and "&". Thanks to a couple of complementary commits, now we can place this code snippets on a separate file without triggering a whole module compiling process, since the typesystem itself will not be alterered. All the injected code from the typesystem was removed and placed into a single file per module inside a top-level directory called glue. Some small fixes were included mainly regarding styling of the code. Task-number: PYSIDE-834 Change-Id: I823e92d241a528d75d5940090008db9bf297f49e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml')
-rw-r--r--sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml51
1 files changed, 13 insertions, 38 deletions
diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
index 6fe90ccb..bb8a3023 100644
--- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
+++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
@@ -40,9 +40,9 @@
****************************************************************************/
-->
<typesystem package="PySide2.QtMultimedia">
- <load-typesystem name="QtCore/typesystem_core.xml" generate="no" />
- <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" />
- <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no" />
+ <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/>
+ <load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/>
+ <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/>
<namespace-type name="QAudio">
<enum-type name="Error"/>
@@ -177,25 +177,15 @@
<enum-type name="Status"/>
<modify-function signature="setViewfinder(QVideoWidget*)">
<modify-argument index="1">
- <replace-type modified-type="QObject *" />
+ <replace-type modified-type="QObject *"/>
</modify-argument>
- <inject-code class="target" position="beginning">
- %BEGIN_ALLOW_THREADS
- QObject* upcastedArg = %CONVERTTOCPP[QObject*](%PYARG_1);
- %CPPSELF.%FUNCTION_NAME(reinterpret_cast&lt; %ARG1_TYPE &gt;(upcastedArg));
- %END_ALLOW_THREADS
- </inject-code>
+ <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
</modify-function>
<modify-function signature="setViewfinder(QGraphicsVideoItem*)">
<modify-argument index="1">
- <replace-type modified-type="QObject *" />
+ <replace-type modified-type="QObject *"/>
</modify-argument>
- <inject-code class="target" position="beginning">
- %BEGIN_ALLOW_THREADS
- QObject* upcastedArg = %CONVERTTOCPP[QObject*](%PYARG_1);
- %CPPSELF.%FUNCTION_NAME(reinterpret_cast&lt; %ARG1_TYPE &gt;(upcastedArg));
- %END_ALLOW_THREADS
- </inject-code>
+ <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
</modify-function>
</object-type>
<object-type name="QCameraCaptureBufferFormatControl"/>
@@ -282,36 +272,21 @@
<enum-type name="Error"/>
<modify-function signature="setVideoOutput(QVideoWidget*)">
<modify-argument index="1">
- <replace-type modified-type="QObject *" />
+ <replace-type modified-type="QObject *"/>
</modify-argument>
- <inject-code class="target" position="beginning">
- %BEGIN_ALLOW_THREADS
- QObject* upcastedArg = %CONVERTTOCPP[QObject*](%PYARG_1);
- %CPPSELF.%FUNCTION_NAME(reinterpret_cast&lt; %ARG1_TYPE &gt;(upcastedArg));
- %END_ALLOW_THREADS
- </inject-code>
+ <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
</modify-function>
<modify-function signature="setVideoOutput(QGraphicsVideoItem*)">
<modify-argument index="1">
- <replace-type modified-type="QObject *" />
+ <replace-type modified-type="QObject *"/>
</modify-argument>
- <inject-code class="target" position="beginning">
- %BEGIN_ALLOW_THREADS
- QObject* upcastedArg = %CONVERTTOCPP[QObject*](%PYARG_1);
- %CPPSELF.%FUNCTION_NAME(reinterpret_cast&lt; %ARG1_TYPE &gt;(upcastedArg));
- %END_ALLOW_THREADS
- </inject-code>
+ <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
</modify-function>
<modify-function signature="setVideoOutput(QAbstractVideoSurface*)">
<modify-argument index="1">
- <replace-type modified-type="QObject *" />
+ <replace-type modified-type="QObject *"/>
</modify-argument>
- <inject-code class="target" position="beginning">
- %BEGIN_ALLOW_THREADS
- QObject* upcastedArg = %CONVERTTOCPP[QObject*](%PYARG_1);
- %CPPSELF.%FUNCTION_NAME(reinterpret_cast&lt; %ARG1_TYPE &gt;(upcastedArg));
- %END_ALLOW_THREADS
- </inject-code>
+ <inject-code class="target" position="beginning" file="../glue/qtmultimedia.cpp" snippet="upcast"/>
</modify-function>
</object-type>
<object-type name="QMediaPlayerControl"/>