From 0d12d71920067be499d9237b4ad04f7f11047759 Mon Sep 17 00:00:00 2001 From: Cristian Maureira-Fredes Date: Fri, 13 Apr 2018 13:55:45 +0200 Subject: Add references from ApiExtractor to shiboken doc Including intersphinx extension allow us to link the documentation from ApiExtractor to shiboken's. ApiExtractor doc need to be build first, so we can use the inventory that sphinx create, to link it to shiboken's configuration. All the harcoded references were replaced by dynamic references. Also new labels were included to properly cross reference topics. Checked the spell on many rst files too. Task-number: PYSIDE-363 Change-Id: I11a50b1f9eee48a00a3de6f957942eb0823eba47 Reviewed-by: Alexandru Croitor --- sources/shiboken2/doc/typeconverters.rst | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'sources/shiboken2/doc/typeconverters.rst') diff --git a/sources/shiboken2/doc/typeconverters.rst b/sources/shiboken2/doc/typeconverters.rst index ea32c7f0c..6b29bdb4f 100644 --- a/sources/shiboken2/doc/typeconverters.rst +++ b/sources/shiboken2/doc/typeconverters.rst @@ -58,22 +58,22 @@ the "" tag must be used. The details will be given later, but the gist of it are the tags -``_, which has only one conversion from C++ to Python, and -``_, that may define the conversion of multiple Python types +:ref:`native-to-target `, which has only one conversion from C++ to Python, and +:ref:`native-to-native `, that may define the conversion of multiple Python types to C++'s "Complex" type. .. image:: images/converter.png :height: 240px :align: center -|project| expects the code for ``_, to directly return the +|project| expects the code for :ref:`native-to-target `, to directly return the Python result of the conversion, and the added conversions inside the -``_ must attribute the Python to C++ conversion result to +:ref:`target-to-native ` must attribute the Python to C++ conversion result to the :ref:`%out ` variable. Expanding on the last example, if the binding developer want a Python 2-tuple of numbers to be accepted by wrapped C++ functions with "Complex" arguments, -an ``_ tag and a custom check must be added. +an :ref:`add-conversion ` tag and a custom check must be added. Here's how to do it: .. code-block:: xml @@ -130,14 +130,12 @@ Here's how to do it: Container Conversions ===================== -Converters for ``_ are pretty much the same as for other type, +Converters for :ref:`container-type ` are pretty much the same as for other type, except that they make use of the type system variables :ref:`%INTYPE_# ` and :ref:`%OUTTYPE_# `. |project| combines the conversion code for containers with the conversion defined (or automatically generated) for the containers. -.. _`container-type`: http://www.pyside.org/docs/apiextractor/typesystem_specifying_types.html#container-type - .. code-block:: xml @@ -288,10 +286,6 @@ In this case, the parts of the implementation that will be used in the new conversion-rule are the ones in the two last method ``static inline PyObject* toPython(const Complex& cpx)`` and ``static inline Complex toCpp(PyObject* pyobj)``. The ``isConvertible`` method -is gone, and the ``checkType`` is now an attribute of the ``_ +is gone, and the ``checkType`` is now an attribute of the :ref:`add-conversion ` tag. Refer back to the first example in this page and you will be able to correlate the above template with the new scheme of conversion rule definition. - -.. _``: http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#native-to-target -.. _``: http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#target-to-native -.. _``: http://www.pyside.org/docs/apiextractor/typesystem_conversionrule.html#add-conversion -- cgit v1.2.3