diff options
| -rw-r--r-- | doc/html/_sources/directives.txt | 14 | ||||
| -rw-r--r-- | doc/html/directives.html | 2 | ||||
| -rw-r--r-- | sphinx/directives.rst | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/doc/html/_sources/directives.txt b/doc/html/_sources/directives.txt index 7e3a2e0..ecaaa5b 100644 --- a/doc/html/_sources/directives.txt +++ b/doc/html/_sources/directives.txt @@ -370,7 +370,7 @@ PyObject \*sipTransferObj The handwritten code must explicitly return a ``PyObject *``. If there was an error then a Python exception must be raised and ``NULL`` returned. -The following example converts a ``QList<QWidget *>`` instance to a Python +The following example converts a ``QPtrList<QWidget *>`` instance to a Python list of ``QWidget`` instances:: %ConvertFromTypeCode @@ -559,7 +559,7 @@ returned. :ref:`ref-derived-classes`. The following example converts a Python list of ``QPoint`` instances to a -``QList<QPoint>`` instance:: +``QPtrList<QPoint>`` instance:: %ConvertToTypeCode // See if we are just being asked to check the type of the Python @@ -584,7 +584,7 @@ The following example converts a Python list of ``QPoint`` instances to a } // Create the instance on the heap. - QList<QPoint> *ql = new QList<QPoint>; + QPtrList<QPoint> *ql = new QPtrList<QPoint>; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { @@ -1307,11 +1307,11 @@ object. For example:: template<Type *> - %MappedType QList + %MappedType QPtrList { %TypeHeaderCode // Include the library interface to the type being mapped. - #include <qlist.h> + #include <qptrlist.h> %End %ConvertToTypeCode @@ -1334,7 +1334,7 @@ For example:: } // Create the instance on the heap. - QList<Type *> *ql = new QList<Type *>; + QPtrList<Type *> *ql = new QPtrList<Type *>; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { @@ -1395,7 +1395,7 @@ For example:: %End } -Using this we can use, for example, ``QList<QObject *>`` throughout the +Using this we can use, for example, ``QPtrList<QObject *>`` throughout the module's specification files (and in any module that imports this one). The generated code will automatically map this to and from a Python list of QObject instances when appropriate. diff --git a/doc/html/directives.html b/doc/html/directives.html index 189d832..7f95891 100644 --- a/doc/html/directives.html +++ b/doc/html/directives.html @@ -1249,7 +1249,7 @@ object.</p> { %TypeHeaderCode // Include the library interface to the type being mapped. -#include <qlist.h> +#include <qptrlist.h> %End %ConvertToTypeCode diff --git a/sphinx/directives.rst b/sphinx/directives.rst index 7e3a2e0..ecaaa5b 100644 --- a/sphinx/directives.rst +++ b/sphinx/directives.rst @@ -370,7 +370,7 @@ PyObject \*sipTransferObj The handwritten code must explicitly return a ``PyObject *``. If there was an error then a Python exception must be raised and ``NULL`` returned. -The following example converts a ``QList<QWidget *>`` instance to a Python +The following example converts a ``QPtrList<QWidget *>`` instance to a Python list of ``QWidget`` instances:: %ConvertFromTypeCode @@ -559,7 +559,7 @@ returned. :ref:`ref-derived-classes`. The following example converts a Python list of ``QPoint`` instances to a -``QList<QPoint>`` instance:: +``QPtrList<QPoint>`` instance:: %ConvertToTypeCode // See if we are just being asked to check the type of the Python @@ -584,7 +584,7 @@ The following example converts a Python list of ``QPoint`` instances to a } // Create the instance on the heap. - QList<QPoint> *ql = new QList<QPoint>; + QPtrList<QPoint> *ql = new QPtrList<QPoint>; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { @@ -1307,11 +1307,11 @@ object. For example:: template<Type *> - %MappedType QList + %MappedType QPtrList { %TypeHeaderCode // Include the library interface to the type being mapped. - #include <qlist.h> + #include <qptrlist.h> %End %ConvertToTypeCode @@ -1334,7 +1334,7 @@ For example:: } // Create the instance on the heap. - QList<Type *> *ql = new QList<Type *>; + QPtrList<Type *> *ql = new QPtrList<Type *>; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { @@ -1395,7 +1395,7 @@ For example:: %End } -Using this we can use, for example, ``QList<QObject *>`` throughout the +Using this we can use, for example, ``QPtrList<QObject *>`` throughout the module's specification files (and in any module that imports this one). The generated code will automatically map this to and from a Python list of QObject instances when appropriate. |