diff options
Diffstat (limited to 'sources/pyside2/PySide2/QtCore/typesystem_core_common.xml')
| -rw-r--r-- | sources/pyside2/PySide2/QtCore/typesystem_core_common.xml | 210 |
1 files changed, 39 insertions, 171 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 7f4cb19b1..8aade34af 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -40,7 +40,7 @@ ****************************************************************************/ --> <typesystem package="PySide2.QtCore"> - <load-typesystem name="typesystem_templates.xml" generate="no"/> + <load-typesystem name="templates/core_common.xml" generate="no"/> <custom-type name="str"/> <custom-type name="PyBytes"/> @@ -81,29 +81,18 @@ <inject-code class="native" position="beginning" file="../glue/qtcore.cpp" snippet="include-pyside"/> - <template name="use_stream_for_format_security"> - // Uses the stream version for security reasons - // see gcc man page at -Wformat-security - %FUNCTION_NAME() << %1; - </template> <add-function signature="qDebug(const char*)"> - <inject-code> - <insert-template name="use_stream_for_format_security"/> - </inject-code> + <inject-code file="../glue/qtcore.cpp" snippet="use-stream-for-format-security"/> </add-function> <add-function signature="qCritical(const char*)"> - <inject-code> - <insert-template name="use_stream_for_format_security"/> - </inject-code> + <inject-code file="../glue/qtcore.cpp" snippet="use-stream-for-format-security"/> </add-function> <add-function signature="qFatal(const char*)"> <inject-code file="../glue/qtcore.cpp" snippet="qfatal"/> </add-function> <add-function signature="qWarning(const char*)"> - <inject-code> - <insert-template name="use_stream_for_format_security"/> - </inject-code> + <inject-code file="../glue/qtcore.cpp" snippet="use-stream-for-format-security"/> </add-function> <!-- TODO: We do not support void* or const void* as arg --> @@ -649,30 +638,6 @@ </conversion-rule> </container-type> - <template name="cppmap_to_pymap_conversion"> - PyObject *%out = PyDict_New(); - for (%INTYPE::const_iterator it = %in.begin(), end = %in.end(); it != end; ++it) { - %INTYPE_0 key = it.key(); - %INTYPE_1 value = it.value(); - PyObject *pyKey = %CONVERTTOPYTHON[%INTYPE_0](key); - PyObject *pyValue = %CONVERTTOPYTHON[%INTYPE_1](value); - PyDict_SetItem(%out, pyKey, pyValue); - Py_DECREF(pyKey); - Py_DECREF(pyValue); - } - return %out; - </template> - <template name="pydict_to_cppmap_conversion"> - PyObject *key; - PyObject *value; - Py_ssize_t pos = 0; - while (PyDict_Next(%in, &pos, &key, &value)) { - %OUTTYPE_0 cppKey = %CONVERTTOCPP[%OUTTYPE_0](key); - %OUTTYPE_1 cppValue = %CONVERTTOCPP[%OUTTYPE_1](value); - %out.insert(cppKey, cppValue); - } - </template> - <container-type name="QHash" type="hash"> <include file-name="QHash" location="global"/> <!-- Include to make enum flags work. --> @@ -1005,46 +970,24 @@ </modify-argument> <inject-code file="../glue/qtcore.cpp" snippet="qresource-data"/> </modify-function> - <template name="QResource_registerResource"> - uchar *ptr = reinterpret_cast<uchar*>(Shiboken::Buffer::getPointer(%PYARG_1)); - %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(const_cast<const uchar*>(ptr), %2); - %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%0); - </template> <modify-function signature="unregisterResource(const uchar*,const QString&)" rename="unregisterResourceData"> <modify-argument index="1"> <replace-type modified-type="PyBuffer"/> </modify-argument> - <inject-code> - <insert-template name="QResource_registerResource"/> - </inject-code> + <inject-code file="../glue/qtcore.cpp" snippet="qresource-registerResource"/> </modify-function> <modify-function signature="registerResource(const uchar*,const QString&)" rename="registerResourceData"> <modify-argument index="1"> <replace-type modified-type="PyBuffer"/> </modify-argument> - <inject-code> - <insert-template name="QResource_registerResource"/> - </inject-code> + <inject-code file="../glue/qtcore.cpp" snippet="qresource-registerResource"/> </modify-function> </object-type> <value-type name="QBasicTimer"/> <value-type name="QByteArrayMatcher"/> <value-type name="QDate" hash-function="PySide::hash" > - <template name="pydatetime_importandcheck_function"> - #ifdef IS_PY3K - #define PySideDateTime_IMPORT PyDateTime_IMPORT - #else - #define PySideDateTime_IMPORT \ - (PyDateTimeAPI = (PyDateTime_CAPI*) PyCObject_Import((char*)"datetime", \ - (char*)"datetime_CAPI")) - #endif - static bool PyDateTime_ImportAndCheck(PyObject *pyIn) { - if (!PyDateTimeAPI) PySideDateTime_IMPORT; - return $DATETIMETYPE_Check(pyIn); - } - </template> <inject-code class="native" position="beginning"> <insert-template name="pydatetime_importandcheck_function"> <replace from="$DATETIMETYPE" to="PyDate"/> @@ -2829,15 +2772,6 @@ <object-type name="QTimerEvent" polymorphic-id-expression="%1->type() == QEvent::Timer"/> <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1->type() == QEvent::DynamicPropertyChange"/> - <template name="stream_read_method"> - %RETURN_TYPE _cpp_result; - (*%CPPSELF) >> _cpp_result; - %PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](_cpp_result); - </template> - - <template name="stream_write_method"> - (*%CPPSELF) << %1; - </template> <object-type name="QDataStream" stream="yes"> <enum-type name="FloatingPointPrecision" since="4.6"/> @@ -2884,49 +2818,31 @@ <modify-function signature="operator<<(const char*)" remove="all"/> <!-- ### --> <add-function signature="operator<<(const QString&)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeQString(const QString&)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="readQString()" return-type="QString"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="writeQChar(const QChar&)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="readQChar()" return-type="QChar"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="writeQStringList(const QStringList&)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="readQStringList()" return-type="QStringList"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="writeQVariant(const QVariant&)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="readQVariant()" return-type="QVariant"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <modify-function signature="readRawData(char*,int)"> <modify-argument index="1"> @@ -2943,125 +2859,77 @@ <!-- Extra functions for primitive type handling --> <add-function signature="readBool()" return-type="bool"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readInt8()" return-type="qint8"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readUInt8()" return-type="quint8"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readUInt16()" return-type="quint16"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readInt16()" return-type="qint16"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readInt32()" return-type="qint32"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readUInt32()" return-type="quint32"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readInt64()" return-type="qint64"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readUInt64()" return-type="quint64"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readFloat()" return-type="float"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readDouble()" return-type="qreal"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="readString()" return-type="QString"> - <inject-code class="target" position="end"> - <insert-template name="stream_read_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-read-method"/> </add-function> <add-function signature="writeBool(bool)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeInt8(qint8)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeUInt8(quint8)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeUInt16(quint16)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeInt16(qint16)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeInt32(qint32)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeUInt32(quint32)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeInt64(qint64)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeUInt64(quint64)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeFloat(float)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeDouble(qreal)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <add-function signature="writeString(QString)"> - <inject-code class="target" position="end"> - <insert-template name="stream_write_method"/> - </inject-code> + <inject-code class="target" position="end" file="../glue/qtcore.cpp" snippet="stream-write-method"/> </add-function> <!-- ### deprecated method --> |