diff options
Diffstat (limited to 'doc/html/_sources')
| -rw-r--r-- | doc/html/_sources/annotations.txt | 2 | ||||
| -rw-r--r-- | doc/html/_sources/c_api.txt | 30 | ||||
| -rw-r--r-- | doc/html/_sources/directives.txt | 2 | ||||
| -rw-r--r-- | doc/html/_sources/introduction.txt | 4 | ||||
| -rw-r--r-- | doc/html/_sources/specification_files.txt | 8 | ||||
| -rw-r--r-- | doc/html/_sources/using.txt | 6 |
6 files changed, 26 insertions, 26 deletions
diff --git a/doc/html/_sources/annotations.txt b/doc/html/_sources/annotations.txt index 05ab847..d43955a 100644 --- a/doc/html/_sources/annotations.txt +++ b/doc/html/_sources/annotations.txt @@ -162,7 +162,7 @@ Argument Annotations encoding is ``"None"`` and the ``str`` type otherwise. Python v2 will use the ``str`` type to represent the argument if the - encoding is ``"None"`` and the ``unicode`` type otherwise. + encoding is ``"None"`` and the ``tqunicode`` type otherwise. .. argument-annotation:: GetWrapper diff --git a/doc/html/_sources/c_api.txt b/doc/html/_sources/c_api.txt index 782056c..7bcacc7 100644 --- a/doc/html/_sources/c_api.txt +++ b/doc/html/_sources/c_api.txt @@ -202,13 +202,13 @@ specification files. ``u`` (long) [unsigned int] Convert a C/C++ ``unsigned int`` to a Python long. - ``w`` (unicode/string) [wchar_t] - Convert a C/C++ wide character to a Python v2 unicode object or a + ``w`` (tqunicode/string) [wchar_t] + Convert a C/C++ wide character to a Python v2 tqunicode object or a Python v3 string object. - ``x`` (unicode/string) [wchar_t \*] + ``x`` (tqunicode/string) [wchar_t \*] Convert a C/C++ ``L'\0'`` terminated wide character string to a Python - v2 unicode object or a Python v3 string object. If the string pointer + v2 tqunicode object or a Python v3 string object. If the string pointer is ``NULL`` then the result is ``Py_None``. ``A`` (string) [char \*] @@ -272,8 +272,8 @@ specification files. Convert a named C/C++ ``enum`` to an instance of the corresponding Python named enum type. - ``G`` (unicode) [wchar_t \*, :cmacro:`SIP_SSIZE_T`] - Convert a C/C++ wide character array and its length to a Python unicode + ``G`` (tqunicode) [wchar_t \*, :cmacro:`SIP_SSIZE_T`] + Convert a C/C++ wide character array and its length to a Python tqunicode object. If the array is ``NULL`` then the length is ignored and the result is ``Py_None``. @@ -1124,7 +1124,7 @@ specification files. Convert a Python string-like object of length 1 to a C/C++ ``char`` according to the encoding ``e``. ``e`` can either be ``A`` for ASCII, ``L`` for Latin-1, or ``8`` for UTF-8. For Python v2 the object may be - either a string or a unicode object that can be encoded. For Python v3 + either a string or a tqunicode object that can be encoded. For Python v3 the object may either be a bytes object or a string object that can be encoded. An object that supports the buffer protocol may also be used. @@ -1182,12 +1182,12 @@ specification files. ``u`` (long) [unsigned int \*] Convert a Python long to a C/C++ ``unsigned int``. - ``w`` (unicode/string) [wchar_t \*] - Convert a Python v2 string or unicode object or a Python v3 string + ``w`` (tqunicode/string) [wchar_t \*] + Convert a Python v2 string or tqunicode object or a Python v3 string object of length 1 to a C/C++ wide character. - ``x`` (unicode/string) [wchar_t \*\*] - Convert a Python v2 string or unicode object or a Python v3 string + ``x`` (tqunicode/string) [wchar_t \*\*] + Convert a Python v2 string or tqunicode object or a Python v3 string object to a C/C++ ``L'\0'`` terminated wide character string. If the Python object is ``Py_None`` then the string is ``NULL``. @@ -1199,7 +1199,7 @@ specification files. identifies the object in the context defined by the ``S`` format character and allows an extra reference to the object to be kept to ensure that the string remains valid. For Python v2 the object may be - either a string or a unicode object that can be encoded. For Python v3 + either a string or a tqunicode object that can be encoded. For Python v3 the object may either be a bytes object or a string object that can be encoded. An object that supports the buffer protocol may also be used. @@ -1258,8 +1258,8 @@ specification files. ``F`` (wrapped enum) [:ctype:`sipTypeDef` \*, enum \*] Convert a Python named enum type to the corresponding C/C++ ``enum``. - ``G`` (unicode/string) [wchar_t \*\*, :cmacro:`SIP_SSIZE_T` \*] - Convert a Python v2 string or unicode object or a Python v3 string + ``G`` (tqunicode/string) [wchar_t \*\*, :cmacro:`SIP_SSIZE_T` \*] + Convert a Python v2 string or tqunicode object or a Python v3 string object to a C/C++ wide character array and its length. If the Python object is ``Py_None`` then the array and length are ``NULL`` and zero respectively. @@ -1696,7 +1696,7 @@ name prefixed by ``sip``. For example, the derived class for class ``Klass`` is ``sipKlass``. If a C++ class doesn't have any virtual or protected methods in it or any of -it's super-class hierarchy, or does not emit any Qt signals, then a derived +it's super-class hierarchy, or does not emit any Qt Q_SIGNALS, then a derived class is not generated. Most of the time handwritten code should ignore the derived classes. The only diff --git a/doc/html/_sources/directives.txt b/doc/html/_sources/directives.txt index 7e3a2e0..7c1a064 100644 --- a/doc/html/_sources/directives.txt +++ b/doc/html/_sources/directives.txt @@ -515,7 +515,7 @@ the correct type prior to conversion. When used as part of a class specification it can automatically convert additional types of Python object. For example, PyQt uses it in the specification of the ``QString`` class to allow Python string objects and -unicode objects to be used wherever ``QString`` instances are expected. +tqunicode objects to be used wherever ``QString`` instances are expected. The following variables are made available to the handwritten code: diff --git a/doc/html/_sources/introduction.txt b/doc/html/_sources/introduction.txt index 8515243..8488b6f 100644 --- a/doc/html/_sources/introduction.txt +++ b/doc/html/_sources/introduction.txt @@ -74,7 +74,7 @@ SIP, and the bindings it produces, have the following features: - support for C++ exceptions and wrapping them as Python exceptions -- the automatic generation of complementary rich comparison slots +- the automatic generation of complementary rich comparison Q_SLOTS - support for deprecation warnings @@ -164,6 +164,6 @@ toolkit. The SIP code generator understands the signal/slot type safe callback mechanism that Qt uses to connect objects together. This allows applications to define -new Python signals, and allows any Python callable object to be used as a slot. +new Python Q_SIGNALS, and allows any Python callable object to be used as a slot. SIP itself does not require Qt to be installed. diff --git a/doc/html/_sources/specification_files.txt b/doc/html/_sources/specification_files.txt index 6ba3aba..ff352f4 100644 --- a/doc/html/_sources/specification_files.txt +++ b/doc/html/_sources/specification_files.txt @@ -130,15 +130,15 @@ file. *class-variable* | **public:** | **public Q_SLOTS:** | - **public slots:** | + **public Q_SLOTS:** | **protected:** | **protected Q_SLOTS:** | - **protected slots:** | + **protected Q_SLOTS:** | **private:** | **private Q_SLOTS:** | - **private slots:** | + **private Q_SLOTS:** | **Q_SIGNALS:** | - **signals:**] + **Q_SIGNALS:**] *constructor* ::= [**explicit**] *name* **(** [*argument-list*] **)** [*exceptions*] [*function-annotations*] diff --git a/doc/html/_sources/using.txt b/doc/html/_sources/using.txt index ff121ce..99fd389 100644 --- a/doc/html/_sources/using.txt +++ b/doc/html/_sources/using.txt @@ -284,7 +284,7 @@ previous examples. instance being constructed has a parent) then ownership of the instance is transferred from Python to C++. It is needed because Qt maintains objects (i.e. instances derived from the ``QObject`` class) in a - hierachy. When an object is destroyed all of its children are also + hierachy. When an object is destroyed all of its tqchildren are also automatically destroyed. It is important, therefore, that the Python garbage collector doesn't also try and destroy them. This is covered in more detail in :ref:`ref-object-ownership`. SIP provides many other @@ -552,8 +552,8 @@ Support for Wide Characters --------------------------- SIP v4.6 introduced support for wide characters (i.e. the ``wchar_t`` type). -Python's C API includes support for converting between unicode objects and wide -character strings and arrays. When converting from a unicode object to wide +Python's C API includes support for converting between tqunicode objects and wide +character strings and arrays. When converting from a tqunicode object to wide characters SIP creates the string or array on the heap (using memory allocated using :cfunc:`sipMalloc()`). This then raises the problem of how this memory is subsequently freed. |