aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2018-04-26 08:03:54 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2018-04-26 08:04:41 +0200
commit9b01aae7777c7ccde9eed1a8c55aead1524e00e5 (patch)
treec62834ca412f290485dd96d2a7522809b8fce6e1 /sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
parent2156651b39fbb6717ed936c94dcd28295436e0a4 (diff)
parent0b842db3a95a44fbda3379d2093cb52f8ae2a1ff (diff)
Merge remote-tracking branch 'origin/5.9' into 5.11
Diffstat (limited to 'sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml')
-rw-r--r--sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml42
1 files changed, 21 insertions, 21 deletions
diff --git a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
index 35effbc7..15c0729e 100644
--- a/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
+++ b/sources/pyside2/PySide2/QtMultimedia/typesystem_multimedia_common.xml
@@ -59,9 +59,9 @@
<object-type name="QAbstractVideoBuffer">
<enum-type name="HandleType"/>
<enum-type name="MapMode"/>
- <modify-function signature="map(QAbstractVideoBuffer::MapMode, int*, int*)" remove="all"/>
+ <modify-function signature="map(QAbstractVideoBuffer::MapMode,int*,int*)" remove="all"/>
<!-- TODO: discuss a way to have this working with the virtual method.
- <modify-function signature="map(QAbstractVideoBuffer::MapMode, int*, int*)">
+ <modify-function signature="map(QAbstractVideoBuffer::MapMode,int*,int*)">
<modify-argument index="0">
<replace-type modified-type="PyObject"/>
</modify-argument>
@@ -87,7 +87,7 @@
<enum-type name="FieldType"/>
<enum-type name="PixelFormat"/>
<modify-function signature="bits(int)" remove="all"/>
- <modify-function signature="bits(int) const" remove="all"/>
+ <modify-function signature="bits(int)const" remove="all"/>
</value-type>
<value-type name="QAudioBuffer"/>
@@ -108,7 +108,7 @@
<define-ownership class="target" owner="c++"/>
</modify-argument>
</modify-function>
- <modify-function signature="start(QIODevice *)">
+ <modify-function signature="start(QIODevice*)">
<modify-argument index="1">
<define-ownership class="target" owner="c++"/>
</modify-argument>
@@ -121,7 +121,7 @@
<define-ownership class="target" owner="c++"/>
</modify-argument>
</modify-function>
- <modify-function signature="start(QIODevice *)">
+ <modify-function signature="start(QIODevice*)">
<modify-argument index="1">
<define-ownership class="target" owner="c++"/>
</modify-argument>
@@ -132,7 +132,7 @@
<object-type name="QAudioProbe"/>
<value-type name="QAudioEncoderSettings"/>
<object-type name="QAudioEncoderSettingsControl">
- <modify-function signature="supportedSampleRates(const QAudioEncoderSettings &amp;, bool *) const" remove="all"/>
+ <modify-function signature="supportedSampleRates(const QAudioEncoderSettings &amp;,bool*)const" remove="all"/>
</object-type>
<object-type name="QAudioInput">
@@ -175,7 +175,7 @@
<enum-type name="Position"/>
<enum-type name="State"/>
<enum-type name="Status"/>
- <modify-function signature="setViewfinder(QVideoWidget *)">
+ <modify-function signature="setViewfinder(QVideoWidget*)">
<modify-argument index="1">
<replace-type modified-type="QObject *" />
</modify-argument>
@@ -186,7 +186,7 @@
%END_ALLOW_THREADS
</inject-code>
</modify-function>
- <modify-function signature="setViewfinder(QGraphicsVideoItem *)">
+ <modify-function signature="setViewfinder(QGraphicsVideoItem*)">
<modify-argument index="1">
<replace-type modified-type="QObject *" />
</modify-argument>
@@ -208,14 +208,14 @@
<enum-type name="FlashMode" flags="FlashModes"/>
<enum-type name="ExposureMode"/>
<enum-type name="MeteringMode"/>
- <modify-function signature="supportedApertures(bool *) const" remove="all"/>
- <modify-function signature="supportedIsoSensitivities(bool *) const" remove="all"/>
- <modify-function signature="supportedShutterSpeeds(bool *) const" remove="all"/>
+ <modify-function signature="supportedApertures(bool*)const" remove="all"/>
+ <modify-function signature="supportedIsoSensitivities(bool*)const" remove="all"/>
+ <modify-function signature="supportedShutterSpeeds(bool*)const" remove="all"/>
</object-type>
-->
<object-type name="QCameraExposureControl">
<enum-type name="ExposureParameter"/>
- <modify-function signature="supportedParameterRange(QCameraExposureControl::ExposureParameter, bool *) const" remove="all"/>
+ <modify-function signature="supportedParameterRange(QCameraExposureControl::ExposureParameter,bool*)const" remove="all"/>
</object-type>
<value-type name="QCameraFocusZone">
<enum-type name="FocusZoneStatus"/>
@@ -232,7 +232,7 @@
<enum-type name="CaptureDestination" flags="CaptureDestinations"/>
<enum-type name="DriveMode"/>
<enum-type name="Error"/>
- <modify-function signature="supportedResolutions(const QImageEncoderSettings &amp;, bool *) const" remove="all"/>
+ <modify-function signature="supportedResolutions(const QImageEncoderSettings &amp;,bool*)const" remove="all"/>
</object-type>
<object-type name="QCameraImageCaptureControl"/>
<!-- Private destructor
@@ -254,7 +254,7 @@
<value-type name="QImageEncoderSettings"/>
<object-type name="QImageEncoderControl">
- <modify-function signature="supportedResolutions(const QImageEncoderSettings &amp;, bool *) const" remove="all"/>
+ <modify-function signature="supportedResolutions(const QImageEncoderSettings &amp;,bool*)const" remove="all"/>
</object-type>
<object-type name="QMediaAudioProbeControl"/>
@@ -275,7 +275,7 @@
<enum-type name="MediaStatus"/>
<enum-type name="Flag" flags="Flags"/>
<enum-type name="Error"/>
- <modify-function signature="setVideoOutput(QVideoWidget *)">
+ <modify-function signature="setVideoOutput(QVideoWidget*)">
<modify-argument index="1">
<replace-type modified-type="QObject *" />
</modify-argument>
@@ -286,7 +286,7 @@
%END_ALLOW_THREADS
</inject-code>
</modify-function>
- <modify-function signature="setVideoOutput(QGraphicsVideoItem *)">
+ <modify-function signature="setVideoOutput(QGraphicsVideoItem*)">
<modify-argument index="1">
<replace-type modified-type="QObject *" />
</modify-argument>
@@ -307,9 +307,9 @@
<enum-type name="Error"/>
<enum-type name="State"/>
<enum-type name="Status"/>
- <modify-function signature="supportedAudioSampleRates(const QAudioEncoderSettings &amp;, bool *) const" remove="all"/>
- <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &amp;, bool *) const" remove="all"/>
- <modify-function signature="supportedResolutions(const QVideoEncoderSettings &amp;, bool *) const" remove="all"/>
+ <modify-function signature="supportedAudioSampleRates(const QAudioEncoderSettings &amp;,bool*)const" remove="all"/>
+ <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &amp;,bool*)const" remove="all"/>
+ <modify-function signature="supportedResolutions(const QVideoEncoderSettings &amp;,bool*)const" remove="all"/>
</object-type>
<object-type name="QMediaRecorderControl"/>
<value-type name="QMediaResource"/>
@@ -346,8 +346,8 @@
<object-type name="QVideoDeviceSelectorControl"/>
<value-type name="QVideoEncoderSettings"/>
<object-type name="QVideoEncoderSettingsControl">
- <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &amp;, bool *) const" remove="all"/>
- <modify-function signature="supportedResolutions(const QVideoEncoderSettings &amp;, bool *) const" remove="all"/>
+ <modify-function signature="supportedFrameRates(const QVideoEncoderSettings &amp;,bool*)const" remove="all"/>
+ <modify-function signature="supportedResolutions(const QVideoEncoderSettings &amp;,bool*)const" remove="all"/>
</object-type>
<object-type name="QVideoFilterRunnable">
<enum-type name="RunFlag" flags="RunFlags"/>