diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 03:12:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-22 03:12:38 -0600 |
| commit | 7d27356bafd5670adcc8753ab5437b3bf8ffa4be (patch) | |
| tree | 959eb3757b9dc41290c81c022e45c955573e9a59 | |
| parent | 6c4cc3653e8dd7668295f3e659b7eb4dc571b67c (diff) | |
| download | sip4-tqt-7d27356bafd5670adcc8753ab5437b3bf8ffa4be.tar.gz sip4-tqt-7d27356bafd5670adcc8753ab5437b3bf8ffa4be.zip | |
Initial TQt conversion
112 files changed, 766 insertions, 765 deletions
diff --git a/custom/custom.c b/custom/custom.c index e5ec2d2..5c7c2c8 100644 --- a/custom/custom.c +++ b/custom/custom.c @@ -14,14 +14,14 @@ int main(int argc, char **argv) * to be a builtin in the custom interpreter. The name of the function * will be the name of the module with "init" prepended. The modules * must be built as static libraries (using the -k flag to configure.py - * for SIP and PyQt). + * for SIP and PyTQt). */ /* The sip module will be builtin. */ extern void initsip(void); /* - * Uncomment these (and in the structure below) to include the PyQt + * Uncomment these (and in the structure below) to include the PyTQt * modules as builtins. */ /* extern void initqt(void);*/ diff --git a/custom/customw.c b/custom/customw.c index 5877076..6359df7 100644 --- a/custom/customw.c +++ b/custom/customw.c @@ -18,14 +18,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, * to be a builtin in the custom interpreter. The name of the function * will be the name of the module with "init" prepended. The modules * must be built as static libraries (using the -k flag to configure.py - * for SIP and PyQt). + * for SIP and PyTQt). */ /* The sip module will be builtin. */ extern void initsip(void); /* - * Uncomment these (and in the structure below) to include the PyQt + * Uncomment these (and in the structure below) to include the PyTQt * modules as builtins. */ /* extern void initqt(void);*/ 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. diff --git a/doc/html/_static/basic.css b/doc/html/_static/basic.css index a04d654..7ebd311 100644 --- a/doc/html/_static/basic.css +++ b/doc/html/_static/basic.css @@ -3,7 +3,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -/* -- main layout ----------------------------------------------------------- */ +/* -- main tqlayout ----------------------------------------------------------- */ div.clearer { clear: both; diff --git a/doc/html/_static/default.css b/doc/html/_static/default.css index 42ed6ec..2363802 100644 --- a/doc/html/_static/default.css +++ b/doc/html/_static/default.css @@ -5,7 +5,7 @@ @import url("basic.css"); -/* -- page layout ----------------------------------------------------------- */ +/* -- page tqlayout ----------------------------------------------------------- */ body { font-family: sans-serif; diff --git a/doc/html/_static/jquery.js b/doc/html/_static/jquery.js index 9263574..17bafa0 100644 --- a/doc/html/_static/jquery.js +++ b/doc/html/_static/jquery.js @@ -1039,7 +1039,7 @@ jQuery.extend({ // IE uses filters for opacity if ( !jQuery.support.opacity && name == "opacity" ) { if ( set ) { - // IE has trouble with opacity if it does not have layout + // IE has trouble with opacity if it does not have tqlayout // Force it by setting the zoom level elem.zoom = 1; @@ -1182,7 +1182,7 @@ jQuery.each({ nextAll: function(elem){return jQuery.dir(elem,"nextSibling");}, prevAll: function(elem){return jQuery.dir(elem,"previousSibling");}, siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);}, - children: function(elem){return jQuery.sibling(elem.firstChild);}, + tqchildren: function(elem){return jQuery.sibling(elem.firstChild);}, contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);} }, function(name, fn){ jQuery.fn[ name ] = function( selector ) { @@ -1250,7 +1250,7 @@ jQuery.each({ empty: function() { // Remove element nodes and prevent memory leaks - jQuery(this).children().remove(); + jQuery(this).tqchildren().remove(); // Remove any remaining nodes while ( this.firstChild ) @@ -2202,7 +2202,7 @@ if ( document.querySelectorAll ) (function(){ var oldSizzle = Sizzle, div = document.createElement("div"); div.innerHTML = "<p class='TEST'></p>"; - // Safari can't handle uppercase or unicode characters when + // Safari can't handle uppercase or tqunicode characters when // in quirks mode. if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) { return; diff --git a/doc/html/annotations.html b/doc/html/annotations.html index fc76524..439dbf4 100644 --- a/doc/html/annotations.html +++ b/doc/html/annotations.html @@ -82,16 +82,16 @@ within the range if it is greater or equal to the lower bound and less than the upper bound. Each bound can be omitted meaning that the range is unbounded in that direction.</p> <p>For example:</p> -<div class="last highlight-python"><pre># This is part of the PyQt4 API up to but excluding v2. -void hex() /API=PyQt4:-2/ +<div class="last highlight-python"><pre># This is part of the PyTQt4 API up to but excluding v2. +void hex() /API=PyTQt4:-2/ -# This is part of the PyQt4 API starting from v2. -void hex() /PyName=hex_, API=PyQt4:2-/</pre> +# This is part of the PyTQt4 API starting from v2. +void hex() /PyName=hex_, API=PyTQt4:2-/</pre> </div> </dd> </dl> <p>The following example shows argument and function annotations:</p> -<div class="highlight-python"><pre>void exec(QWidget * /Transfer/) /ReleaseGIL, PyName=call_exec/;</pre> +<div class="highlight-python"><pre>void exec(TQWidget * /Transfer/) /ReleaseGIL, PyName=call_exec/;</pre> </div> <p>Note that the current version of SIP does not complain about unknown annotations, or annotations used out of their correct context.</p> @@ -191,7 +191,7 @@ directive. If the directive is not specified then <tt class="xref docutils lite <p>Python v3 will use the <tt class="docutils literal"><span class="pre">bytes</span></tt> type to represent the argument if the encoding is <tt class="docutils literal"><span class="pre">"None"</span></tt> and the <tt class="docutils literal"><span class="pre">str</span></tt> type otherwise.</p> <p>Python v2 will use the <tt class="docutils literal"><span class="pre">str</span></tt> type to represent the argument if the -encoding is <tt class="docutils literal"><span class="pre">"None"</span></tt> and the <tt class="docutils literal"><span class="pre">unicode</span></tt> type otherwise.</p> +encoding is <tt class="docutils literal"><span class="pre">"None"</span></tt> and the <tt class="docutils literal"><span class="pre">tqunicode</span></tt> type otherwise.</p> </dd></dl> <dl class="argument-annotation"> diff --git a/doc/html/build_system.html b/doc/html/build_system.html index 11016d4..b997c3c 100644 --- a/doc/html/build_system.html +++ b/doc/html/build_system.html @@ -56,18 +56,18 @@ care of the details of particular combinations of platform and compiler. It supports over 50 different platform/compiler combinations.</p> <p>The build system is implemented as a pure Python module called <tt class="xref docutils literal"><span class="pre">sipconfig</span></tt> that contains a number of classes and functions. Using this module you can -write bespoke configuration scripts (e.g. PyQt’s <tt class="docutils literal"><span class="pre">configure.py</span></tt>) or use it +write bespoke configuration scripts (e.g. PyTQt’s <tt class="docutils literal"><span class="pre">configure.py</span></tt>) or use it with other Python based build systems (e.g. <a class="reference external" href="http://www.python.org/sigs/distutils-sig/distutils.html">Distutils</a> and <a class="reference external" href="http://www.scons.org">SCons</a>).</p> <p>An important feature of SIP is the ability to generate bindings that are built on top of existing bindings. For example, both <a class="reference external" href="http://www.riverbankcomputing.com/software/pykde/">PyKDE</a> and -<a class="reference external" href="http://pyqwt.sourceforge.net/">PyQwt</a> are built on top of PyQt but all three -packages are maintained by different developers. To make this easier PyQt +<a class="reference external" href="http://pyqwt.sourceforge.net/">PyQwt</a> are built on top of PyTQt but all three +packages are maintained by different developers. To make this easier PyTQt includes its own configuration module, <tt class="docutils literal"><span class="pre">pyqtconfig</span></tt>, that contains additional classes intended to be used by the configuration scripts of bindings built on -top of PyQt. The SIP build system includes facilities that do a lot of the +top of PyTQt. The SIP build system includes facilities that do a lot of the work of creating these additional configuration modules.</p> <dl class="function"> <dt id="sipconfig.create_config_module"> @@ -551,12 +551,12 @@ and <tt class="docutils literal"><span class="pre">BMAKE</span></tt>.</dd></dl> <a title="sipconfig.Configuration" class="reference internal" href="#sipconfig.Configuration"><tt class="xref docutils literal"><span class="pre">Configuration</span></tt></a> class or a sub-class.</li> <li><em>console</em> – is set if the target is a console (rather than GUI) target. This only affects Windows and is ignored on other platforms.</li> -<li><em>qt</em> – is set if the target uses Qt. For Qt v4 a list of Qt libraries may -be specified and a simple non-zero value implies QtCore and QtGui.</li> +<li><em>qt</em> – is set if the target uses TQt. For TQt v4 a list of TQt libraries may +be specified and a simple non-zero value implies TQtCore and TQtGui.</li> <li><em>opengl</em> – is set if the target uses OpenGL.</li> <li><em>python</em> – is set if the target uses Python.h.</li> <li><em>threaded</em> – is set if the target requires thread support. It is set -automatically if the target uses Qt and Qt has thread support +automatically if the target uses TQt and TQt has thread support enabled.</li> <li><em>warnings</em> – is set if compiler warning messages should be enabled. The default of <tt class="xref docutils literal"><span class="pre">None</span></tt> means that warnings are enabled for SIP v4.x and diff --git a/doc/html/c_api.html b/doc/html/c_api.html index b761f8a..d51cb19 100644 --- a/doc/html/c_api.html +++ b/doc/html/c_api.html @@ -261,12 +261,12 @@ the result is <tt class="docutils literal"><span class="pre">Py_None</span></tt> <dd>Convert a C/C++ <tt class="docutils literal"><span class="pre">unsigned</span> <span class="pre">short</span></tt> to a Python long.</dd> <dt><tt class="docutils literal"><span class="pre">u</span></tt> (long) [unsigned int]</dt> <dd>Convert a C/C++ <tt class="docutils literal"><span class="pre">unsigned</span> <span class="pre">int</span></tt> to a Python long.</dd> -<dt><tt class="docutils literal"><span class="pre">w</span></tt> (unicode/string) [wchar_t]</dt> -<dd>Convert a C/C++ wide character to a Python v2 unicode object or a +<dt><tt class="docutils literal"><span class="pre">w</span></tt> (tqunicode/string) [wchar_t]</dt> +<dd>Convert a C/C++ wide character to a Python v2 tqunicode object or a Python v3 string object.</dd> -<dt><tt class="docutils literal"><span class="pre">x</span></tt> (unicode/string) [wchar_t *]</dt> +<dt><tt class="docutils literal"><span class="pre">x</span></tt> (tqunicode/string) [wchar_t *]</dt> <dd>Convert a C/C++ <tt class="docutils literal"><span class="pre">L'\0'</span></tt> 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 <tt class="docutils literal"><span class="pre">NULL</span></tt> then the result is <tt class="docutils literal"><span class="pre">Py_None</span></tt>.</dd> <dt><tt class="docutils literal"><span class="pre">A</span></tt> (string) [char *]</dt> <dd>Convert a C/C++ <tt class="docutils literal"><span class="pre">'\0'</span></tt> terminated string to a Python v2 or v3 string @@ -329,8 +329,8 @@ Python named enum type.</p> <dt><tt class="docutils literal"><span class="pre">F</span></tt> (wrapped enum) [enum, <tt class="xref docutils literal"><span class="pre">sipTypeDef</span></tt> *]</dt> <dd>Convert a named C/C++ <tt class="docutils literal"><span class="pre">enum</span></tt> to an instance of the corresponding Python named enum type.</dd> -<dt><tt class="docutils literal"><span class="pre">G</span></tt> (unicode) [wchar_t *, <a title="SIP_SSIZE_T" class="reference internal" href="#SIP_SSIZE_T"><tt class="xref docutils literal"><span class="pre">SIP_SSIZE_T</span></tt></a>]</dt> -<dd>Convert a C/C++ wide character array and its length to a Python unicode +<dt><tt class="docutils literal"><span class="pre">G</span></tt> (tqunicode) [wchar_t *, <a title="SIP_SSIZE_T" class="reference internal" href="#SIP_SSIZE_T"><tt class="xref docutils literal"><span class="pre">SIP_SSIZE_T</span></tt></a>]</dt> +<dd>Convert a C/C++ wide character array and its length to a Python tqunicode object. If the array is <tt class="docutils literal"><span class="pre">NULL</span></tt> then the length is ignored and the result is <tt class="docutils literal"><span class="pre">Py_None</span></tt>.</dd> <dt><tt class="docutils literal"><span class="pre">N</span></tt> (wrapped instance) [<em>type</em> *, <tt class="xref docutils literal"><span class="pre">sipTypeDef</span></tt> *, PyObject *]</dt> @@ -1428,7 +1428,7 @@ to be passed.</p> <dd>Convert a Python string-like object of length 1 to a C/C++ <tt class="docutils literal"><span class="pre">char</span></tt> according to the encoding <tt class="docutils literal"><span class="pre">e</span></tt>. <tt class="docutils literal"><span class="pre">e</span></tt> can either be <tt class="docutils literal"><span class="pre">A</span></tt> for ASCII, <tt class="docutils literal"><span class="pre">L</span></tt> for Latin-1, or <tt class="docutils literal"><span class="pre">8</span></tt> 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.</dd> <dt><tt class="docutils literal"><span class="pre">b</span></tt> (integer) [bool *]</dt> @@ -1472,11 +1472,11 @@ then the string is <tt class="docutils literal"><span class="pre">NULL</span></t <dd>Convert a Python long to a C/C++ <tt class="docutils literal"><span class="pre">unsigned</span> <span class="pre">short</span></tt>.</dd> <dt><tt class="docutils literal"><span class="pre">u</span></tt> (long) [unsigned int *]</dt> <dd>Convert a Python long to a C/C++ <tt class="docutils literal"><span class="pre">unsigned</span> <span class="pre">int</span></tt>.</dd> -<dt><tt class="docutils literal"><span class="pre">w</span></tt> (unicode/string) [wchar_t *]</dt> -<dd>Convert a Python v2 string or unicode object or a Python v3 string +<dt><tt class="docutils literal"><span class="pre">w</span></tt> (tqunicode/string) [wchar_t *]</dt> +<dd>Convert a Python v2 string or tqunicode object or a Python v3 string object of length 1 to a C/C++ wide character.</dd> -<dt><tt class="docutils literal"><span class="pre">x</span></tt> (unicode/string) [wchar_t **]</dt> -<dd>Convert a Python v2 string or unicode object or a Python v3 string +<dt><tt class="docutils literal"><span class="pre">x</span></tt> (tqunicode/string) [wchar_t **]</dt> +<dd>Convert a Python v2 string or tqunicode object or a Python v3 string object to a C/C++ <tt class="docutils literal"><span class="pre">L'\0'</span></tt> terminated wide character string. If the Python object is <tt class="docutils literal"><span class="pre">Py_None</span></tt> then the string is <tt class="docutils literal"><span class="pre">NULL</span></tt>.</dd> <dt><tt class="docutils literal"><span class="pre">Ae</span></tt> (object) [int, const char **]</dt> @@ -1487,7 +1487,7 @@ ASCII, <tt class="docutils literal"><span class="pre">L</span></tt> for Latin-1, identifies the object in the context defined by the <tt class="docutils literal"><span class="pre">S</span></tt> 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.</dd> <dt><tt class="docutils literal"><span class="pre">B</span></tt> (string/bytes) [int, const char **]</dt> @@ -1548,8 +1548,8 @@ not passed if this flag is specified.</dd> </dd> <dt><tt class="docutils literal"><span class="pre">F</span></tt> (wrapped enum) [<tt class="xref docutils literal"><span class="pre">sipTypeDef</span></tt> *, enum *]</dt> <dd>Convert a Python named enum type to the corresponding C/C++ <tt class="docutils literal"><span class="pre">enum</span></tt>.</dd> -<dt><tt class="docutils literal"><span class="pre">G</span></tt> (unicode/string) [wchar_t **, <a title="SIP_SSIZE_T" class="reference internal" href="#SIP_SSIZE_T"><tt class="xref docutils literal"><span class="pre">SIP_SSIZE_T</span></tt></a> *]</dt> -<dd>Convert a Python v2 string or unicode object or a Python v3 string +<dt><tt class="docutils literal"><span class="pre">G</span></tt> (tqunicode/string) [wchar_t **, <a title="SIP_SSIZE_T" class="reference internal" href="#SIP_SSIZE_T"><tt class="xref docutils literal"><span class="pre">SIP_SSIZE_T</span></tt></a> *]</dt> +<dd>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 <tt class="docutils literal"><span class="pre">Py_None</span></tt> then the array and length are <tt class="docutils literal"><span class="pre">NULL</span></tt> and zero respectively.</dd> @@ -2080,7 +2080,7 @@ corresponding generated type structure (see <a class="reference internal" href=" name prefixed by <tt class="docutils literal"><span class="pre">sip</span></tt>. For example, the derived class for class <tt class="docutils literal"><span class="pre">Klass</span></tt> is <tt class="docutils literal"><span class="pre">sipKlass</span></tt>.</p> <p>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 TQt signals, then a derived class is not generated.</p> <p>Most of the time handwritten code should ignore the derived classes. The only exception is that handwritten constructor code specified using the diff --git a/doc/html/command_line.html b/doc/html/command_line.html index f20045a..5d42844 100644 --- a/doc/html/command_line.html +++ b/doc/html/command_line.html @@ -70,8 +70,8 @@ is omitted then <tt class="docutils literal"><span class="pre">stdin</span></tt> <dl class="cmdoption"> <dt id="cmdoption-sip-a"> <tt class="descname">-a</tt><tt class="descclassname"> <FILE></tt><a class="headerlink" href="#cmdoption-sip-a" title="Permalink to this definition">¶</a></dt> -<dd>The name of the QScintilla API file to generate. This file contains a -description of the module API in a form that the QScintilla editor +<dd>The name of the TQScintilla API file to generate. This file contains a +description of the module API in a form that the TQScintilla editor component can use for auto-completion and call tips. (The file may also be used by the SciTE editor but must be sorted first.) By default the file is not generated.</dd></dl> diff --git a/doc/html/directives.html b/doc/html/directives.html index eab1185..102bf61 100644 --- a/doc/html/directives.html +++ b/doc/html/directives.html @@ -100,7 +100,7 @@ Klass *klassInstance; version number must be greater than or equal to 1.</p> <p>See <a class="reference external" href="using.html#ref-incompat-apis"><em>Managing Incompatible APIs</em></a> for more detail.</p> <p>For example:</p> -<div class="highlight-python"><pre>%API PyQt4 1</pre> +<div class="highlight-python"><pre>%API PyTQt4 1</pre> </div> <dl class="directive"> <dt id="directive-%BIGetBufferCode"> @@ -313,9 +313,9 @@ same name.</p> subsequent <a class="reference internal" href="#directive-%CModule"><tt class="xref docutils literal"><span class="pre">%CModule</span></tt></a> or <a class="reference internal" href="#directive-%Module"><tt class="xref docutils literal"><span class="pre">%Module</span></tt></a> directive is interpreted as defining a component module.</p> <p>For example:</p> -<div class="highlight-python"><pre>%CompositeModule PyQt4.Qt -%Include QtCore/QtCoremod.sip -%Include QtGui/QtGuimod.sip</pre> +<div class="highlight-python"><pre>%CompositeModule PyTQt4.TQt +%Include TQtCore/TQtCoremod.sip +%Include TQtGui/TQtGuimod.sip</pre> </div> <p>The main purpose of a composite module is as a programmer convenience as they don’t have to remember which which individual module an object is defined in.</p> @@ -333,9 +333,9 @@ SIP generated modules (refered to as component modules in this context).</p> subsequent <a class="reference internal" href="#directive-%CModule"><tt class="xref docutils literal"><span class="pre">%CModule</span></tt></a> or <a class="reference internal" href="#directive-%Module"><tt class="xref docutils literal"><span class="pre">%Module</span></tt></a> directive is interpreted as defining a component module.</p> <p>For example:</p> -<div class="highlight-python"><pre>%ConsolidatedModule PyQt4._qt -%Include QtCore/QtCoremod.sip -%Include QtGui/QtGuimod.sip</pre> +<div class="highlight-python"><pre>%ConsolidatedModule PyTQt4._qt +%Include TQtCore/TQtCoremod.sip +%Include TQtGui/TQtGuimod.sip</pre> </div> <p>A consolidated module is not intended to be explicitly imported by an application. Instead it is imported by its component modules when they @@ -380,8 +380,8 @@ made to each element of the list.</dd> </dl> <p>The handwritten code must explicitly return a <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt>. If there was an error then a Python exception must be raised and <tt class="docutils literal"><span class="pre">NULL</span></tt> returned.</p> -<p>The following example converts a <tt class="docutils literal"><span class="pre">QList<QWidget</span> <span class="pre">*></span></tt> instance to a Python -list of <tt class="docutils literal"><span class="pre">QWidget</span></tt> instances:</p> +<p>The following example converts a <tt class="docutils literal"><span class="pre">TQList<TQWidget</span> <span class="pre">*></span></tt> instance to a Python +list of <tt class="docutils literal"><span class="pre">TQWidget</span></tt> instances:</p> <div class="highlight-python"><pre>%ConvertFromTypeCode PyObject *l; @@ -390,15 +390,15 @@ list of <tt class="docutils literal"><span class="pre">QWidget</span></tt> insta return NULL; // Go through each element in the C++ instance and convert it to a - // wrapped QWidget. + // wrapped TQWidget. for (int i = 0; i < sipCpp->size(); ++i) { - QWidget *w = sipCpp->at(i); + TQWidget *w = sipCpp->at(i); PyObject *wobj; - // Get the Python wrapper for the QWidget instance, creating a new + // Get the Python wrapper for the TQWidget instance, creating a new // one if necessary, and handle any ownership transfer. - if ((wobj = sipConvertFromType(w, sipType_QWidget, sipTransferObj)) == NULL) + if ((wobj = sipConvertFromType(w, sipType_TQWidget, sipTransferObj)) == NULL) { // There was an error so garbage collect the Python list. Py_DECREF(l); @@ -469,21 +469,21 @@ it can.</p> </dd> </dl> <p>The handwritten code must not explicitly return.</p> -<p>The following example shows the sub-class conversion code for <tt class="docutils literal"><span class="pre">QEvent</span></tt> based -class hierarchy in PyQt:</p> -<div class="highlight-python"><pre>class QEvent +<p>The following example shows the sub-class conversion code for <tt class="docutils literal"><span class="pre">TQEvent</span></tt> based +class hierarchy in PyTQt:</p> +<div class="highlight-python"><pre>class TQEvent { %ConvertToSubClassCode - // QEvent sub-classes provide a unique type ID. + // TQEvent sub-classes provide a unique type ID. switch (sipCpp->type()) { - case QEvent::Timer: - sipType = sipType_QTimerEvent; + case TQEvent::Timer: + sipType = sipType_TQTimerEvent; break; - case QEvent::KeyPress: - case QEvent::KeyRelease: - sipType = sipType_QKeyEvent; + case TQEvent::KeyPress: + case TQEvent::KeyRelease: + sipType = sipType_TQKeyEvent; break; // Skip the remaining event types to keep the example short. @@ -514,9 +514,9 @@ used as part of the <a class="reference internal" href="#directive-%MappedType"> specification. The code is also called to determine if the Python object is of the correct type prior to conversion.</p> <p>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 <tt class="docutils literal"><span class="pre">QString</span></tt> class to allow Python string objects and -unicode objects to be used wherever <tt class="docutils literal"><span class="pre">QString</span></tt> instances are expected.</p> +additional types of Python object. For example, PyTQt uses it in the +specification of the <tt class="docutils literal"><span class="pre">TQString</span></tt> class to allow Python string objects and +tqunicode objects to be used wherever <tt class="docutils literal"><span class="pre">TQString</span></tt> instances are expected.</p> <p>The following variables are made available to the handwritten code:</p> <dl class="docutils"> <dt>int *sipIsErr</dt> @@ -554,8 +554,8 @@ returned instance is a derived class. See <a class="reference external" href="c_api.html#ref-derived-classes"><em>Generated Derived Classes</em></a>.</li> </ul> </blockquote> -<p>The following example converts a Python list of <tt class="docutils literal"><span class="pre">QPoint</span></tt> instances to a -<tt class="docutils literal"><span class="pre">QList<QPoint></span></tt> instance:</p> +<p>The following example converts a Python list of <tt class="docutils literal"><span class="pre">TQPoint</span></tt> instances to a +<tt class="docutils literal"><span class="pre">TQList<TQPoint></span></tt> instance:</p> <div class="highlight-python"><pre>%ConvertToTypeCode // See if we are just being asked to check the type of the Python // object. @@ -567,11 +567,11 @@ returned instance is a derived class. See return 0; // Check the type of each element. We specify SIP_NOT_NONE to - // disallow None because it is a list of QPoint, not of a pointer - // to a QPoint, so None isn't appropriate. + // disallow None because it is a list of TQPoint, not of a pointer + // to a TQPoint, so None isn't appropriate. for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), - sipType_QPoint, SIP_NOT_NONE)) + sipType_TQPoint, SIP_NOT_NONE)) return 0; // The type is valid. @@ -579,26 +579,26 @@ returned instance is a derived class. See } // Create the instance on the heap. - QList<QPoint> *ql = new QList<QPoint>; + TQList<TQPoint> *ql = new TQList<TQPoint>; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { - QPoint *qp; + TQPoint *qp; int state; // Get the address of the element's C++ instance. Note that, in // this case, we don't apply any ownership changes to the list // elements, only to the list itself. - qp = reinterpret_cast<QPoint *>(sipConvertToType( + qp = reinterpret_cast<TQPoint *>(sipConvertToType( PyList_GET_ITEM(sipPy, i), - sipType_QPoint, 0, + sipType_TQPoint, 0, SIP_NOT_NONE, &state, sipIsErr)); // Deal with any errors. if (*sipIsErr) { - sipReleaseType(qp, sipType_QPoint, state); + sipReleaseType(qp, sipType_TQPoint, state); // Tidy up. delete ql; @@ -609,11 +609,11 @@ returned instance is a derived class. See ql->append(*qp); - // A copy of the QPoint was appended to the list so we no longer + // A copy of the TQPoint was appended to the list so we no longer // need it. It may be a temporary instance that should be // destroyed, or a wrapped instance that should not be destroyed. // sipReleaseType() will do the right thing. - sipReleaseType(qp, sipType_QPoint, state); + sipReleaseType(qp, sipType_TQPoint, state); } // Return the instance. @@ -685,7 +685,7 @@ modules, that doesn’t have an explicit meta-type.</p> meta-type used by a particular C/C++ type.</p> <p>See the section <a class="reference external" href="using.html#ref-types-metatypes"><em>Types and Meta-types</em></a> for more details.</p> <p>For example:</p> -<div class="highlight-python"><pre>%DefaultMetatype PyQt4.QtCore.pyqtWrapperType</pre> +<div class="highlight-python"><pre>%DefaultMetatype PyTQt4.TQtCore.pyqtWrapperType</pre> </div> <dl class="directive"> <dt id="directive-%DefaultSupertype"> @@ -916,8 +916,8 @@ pointer to the structure or class.</dd> <dt>int sipRes</dt> <dd>The handwritten code should set this to the result to be returned.</dd> </dl> -<p>The following simplified example is taken from PyQt. The <tt class="docutils literal"><span class="pre">QCustomEvent</span></tt> -class allows arbitary data to be attached to the event. In PyQt this data is +<p>The following simplified example is taken from PyTQt. The <tt class="docutils literal"><span class="pre">TQCustomEvent</span></tt> +class allows arbitary data to be attached to the event. In PyTQt this data is always a Python object and so should be handled by the garbage collector:</p> <div class="highlight-python"><pre>%GCClearCode PyObject *obj; @@ -961,7 +961,7 @@ collector.</dd> <dt>int sipRes</dt> <dd>The handwritten code should set this to the result to be returned.</dd> </dl> -<p>The following simplified example is taken from PyQt’s <tt class="docutils literal"><span class="pre">QCustomEvent</span></tt> class:</p> +<p>The following simplified example is taken from PyTQt’s <tt class="docutils literal"><span class="pre">TQCustomEvent</span></tt> class:</p> <div class="highlight-python"><pre>%GCTraverseCode PyObject *obj; @@ -1245,7 +1245,7 @@ the handwritten code that converts an instance of the mapped type to a Python object.</p> <p>For example:</p> <div class="highlight-python"><pre>template<Type *> -%MappedType QList +%MappedType TQList { %TypeHeaderCode // Include the library interface to the type being mapped. @@ -1272,7 +1272,7 @@ object.</p> } // Create the instance on the heap. - QList<Type *> *ql = new QList<Type *>; + TQList<Type *> *ql = new TQList<Type *>; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { @@ -1333,9 +1333,9 @@ object.</p> %End }</pre> </div> -<p>Using this we can use, for example, <tt class="docutils literal"><span class="pre">QList<QObject</span> <span class="pre">*></span></tt> throughout the +<p>Using this we can use, for example, <tt class="docutils literal"><span class="pre">TQList<TQObject</span> <span class="pre">*></span></tt> 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 +generated code will automatically map this to and from a Python list of TQObject instances when appropriate.</p> <dl class="directive"> <dt id="directive-%MethodCode"> diff --git a/doc/html/genindex.html b/doc/html/genindex.html index 8b714a6..cd0fc4f 100644 --- a/doc/html/genindex.html +++ b/doc/html/genindex.html @@ -569,7 +569,7 @@ <dt><a href="command_line.html#cmdoption-sip-x">-x <FEATURE></a></dt> <dt><a href="command_line.html#cmdoption-sip-z">-z <FILE></a></dt> </dl></dd> -<dt><a href="specification_files.html#stype-SIP_ANYSLOT">SIP_ANYSLOT (SIP type)</a></dt> +<dt><a href="specification_files.html#stype-SIP_ANYSLOT">SIP_ANYTQT_SLOT (SIP type)</a></dt> <dt><a href="c_api.html#SIP_API_MAJOR_NR">SIP_API_MAJOR_NR (C macro)</a></dt> <dt><a href="c_api.html#SIP_API_MINOR_NR">SIP_API_MINOR_NR (C macro)</a></dt> <dt><a href="build_system.html#sipconfig.Configuration.sip_bin">sip_bin (sipconfig.Configuration attribute)</a></dt> @@ -587,7 +587,7 @@ <dt><a href="specification_files.html#stype-SIP_PYSLICE">SIP_PYSLICE (SIP type)</a></dt> <dt><a href="specification_files.html#stype-SIP_PYTUPLE">SIP_PYTUPLE (SIP type)</a></dt> <dt><a href="specification_files.html#stype-SIP_PYTYPE">SIP_PYTYPE (SIP type)</a></dt> -<dt><a href="specification_files.html#stype-SIP_QOBJECT">SIP_QOBJECT (SIP type)</a></dt> +<dt><a href="specification_files.html#stype-SIP_TQOBJECT">SIP_TQOBJECT (SIP type)</a></dt> <dt><a href="specification_files.html#stype-SIP_RXOBJ_CON">SIP_RXOBJ_CON (SIP type)</a></dt> <dt><a href="specification_files.html#stype-SIP_RXOBJ_DIS">SIP_RXOBJ_DIS (SIP type)</a></dt> <dt><a href="specification_files.html#stype-SIP_SIGNAL">SIP_SIGNAL (SIP type)</a></dt> diff --git a/doc/html/incompatibilities.html b/doc/html/incompatibilities.html index 1663016..e3f8998 100644 --- a/doc/html/incompatibilities.html +++ b/doc/html/incompatibilities.html @@ -102,8 +102,8 @@ from <a title="sipBuildResult" class="reference external" href="c_api.html#sipBu been removed.</p> </div> <div class="section" id="removal-of-pyqt-specific-features"> -<h3>Removal of PyQt-specific Features<a class="headerlink" href="#removal-of-pyqt-specific-features" title="Permalink to this headline">¶</a></h3> -<p>The following PyQt-specific support functions have been removed.</p> +<h3>Removal of PyTQt-specific Features<a class="headerlink" href="#removal-of-pyqt-specific-features" title="Permalink to this headline">¶</a></h3> +<p>The following PyTQt-specific support functions have been removed.</p> <ul class="simple"> <li><tt class="xref docutils literal"><span class="pre">sipConnectRx()</span></tt></li> <li><tt class="xref docutils literal"><span class="pre">sipDisconnectRx()</span></tt></li> @@ -210,7 +210,7 @@ still supported).</p> <li><a class="reference external" href="#truediv">__truediv__</a></li> <li><a class="reference external" href="#sipwrapper-user-member">sipWrapper user Member</a></li> <li><a class="reference external" href="#removal-of-previously-deprecated-features">Removal of Previously Deprecated Features</a></li> -<li><a class="reference external" href="#removal-of-pyqt-specific-features">Removal of PyQt-specific Features</a></li> +<li><a class="reference external" href="#removal-of-pyqt-specific-features">Removal of PyTQt-specific Features</a></li> <li><a class="reference external" href="#id1">Newly Deprecated Features</a></li> </ul> </li> diff --git a/doc/html/index.html b/doc/html/index.html index ed2d37d..5d31606 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -51,7 +51,7 @@ <li class="toctree-l2"><a class="reference external" href="introduction.html#license">License</a></li> <li class="toctree-l2"><a class="reference external" href="introduction.html#features">Features</a></li> <li class="toctree-l2"><a class="reference external" href="introduction.html#sip-components">SIP Components</a></li> -<li class="toctree-l2"><a class="reference external" href="introduction.html#qt-support">Qt Support</a></li> +<li class="toctree-l2"><a class="reference external" href="introduction.html#qt-support">TQt Support</a></li> </ul> </li> <li class="toctree-l1"><a class="reference external" href="incompatibilities.html">Potential Incompatibilities with Earlier Versions</a><ul> diff --git a/doc/html/introduction.html b/doc/html/introduction.html index c952bf7..70fce7f 100644 --- a/doc/html/introduction.html +++ b/doc/html/introduction.html @@ -53,8 +53,8 @@ <p>This is the reference guide for SIP 4.10.5. SIP is a tool for automatically generating <a class="reference external" href="http://www.python.org">Python</a> bindings for C and C++ libraries. SIP was originally developed in 1998 for -<a class="reference external" href="http://www.riverbankcomputing.com/software/pyqt">PyQt</a> - the Python -bindings for the Qt GUI toolkit - but is suitable for generating bindings for +<a class="reference external" href="http://www.riverbankcomputing.com/software/pyqt">PyTQt</a> - the Python +bindings for the TQt GUI toolkit - but is suitable for generating bindings for any C or C++ library.</p> <p>This version of SIP generates bindings for Python v2.3 or later, including Python v3.</p> @@ -163,13 +163,13 @@ needed to build the extension module. It is covered in detail in </ul> </div> <div class="section" id="qt-support"> -<h2>Qt Support<a class="headerlink" href="#qt-support" title="Permalink to this headline">¶</a></h2> -<p>SIP has specific support for the creation of bindings based on Nokia’s Qt +<h2>TQt Support<a class="headerlink" href="#qt-support" title="Permalink to this headline">¶</a></h2> +<p>SIP has specific support for the creation of bindings based on Nokia’s TQt toolkit.</p> <p>The SIP code generator understands the signal/slot type safe callback mechanism -that Qt uses to connect objects together. This allows applications to define +that TQt 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.</p> -<p>SIP itself does not require Qt to be installed.</p> +<p>SIP itself does not require TQt to be installed.</p> </div> </div> @@ -185,7 +185,7 @@ new Python signals, and allows any Python callable object to be used as a slot.< <li><a class="reference external" href="#license">License</a></li> <li><a class="reference external" href="#features">Features</a></li> <li><a class="reference external" href="#sip-components">SIP Components</a></li> -<li><a class="reference external" href="#qt-support">Qt Support</a></li> +<li><a class="reference external" href="#qt-support">TQt Support</a></li> </ul> </li> </ul> diff --git a/doc/html/searchindex.js b/doc/html/searchindex.js index 2099b9d..fcc4f5f 100644 --- a/doc/html/searchindex.js +++ b/doc/html/searchindex.js @@ -1 +1 @@ -Search.setIndex({desctypes:{"0":"cfunction","1":"method","2":"function","3":"cmacro","4":"attribute","5":"ctype","6":"cmember","7":"class","8":"cvar","9":"data"},terms:{sipcanconverttoinst:[9,4],sipconvertfromtyp:[10,4],secondli:13,prefix:[0,13,10,11,4],mkcustom:7,whose:[13,8,4],accur:12,"const":[4,10,11,12,13,8],cmdclass:3,pylist_set_item:10,under:[0,5,10,2],qlabel:13,everi:[0,13],ascapsul:14,"void":[4,14,10,12,13,8],affect:[0,10],"__nonzero__":12,factori:[13,8,4],sip_pydict:[12,8],initialis:[0,13,10],sipconvertfromvoidptrands:4,abil:[0,5],direct:[0,1,4,6,10,12,13,8],second:0,b_mod:10,module_as_lib:0,even:[12,9,10],neg:[0,14,4],qpoint:10,"new":[3,4,5,8,10,12,13,14],net:0,ever:8,sipdisconnectrx:9,getsiz:14,q_os_win:13,mem:4,never:[13,10,8,4],here:[5,12],debugg:8,path:[13,2,3],interpret:[0,1,2,4,5,6,7,10,11,12,13,8],incdir:2,adopt:10,create_cont:0,create_word:13,sip_derived_class:10,mkdir:0,default_sip_dir:[0,13],unix:[0,5,7,13],pythonmodulemakefil:0,total:10,unit:10,describ:[3,4,5,6,7,9,10,12,13,8],would:[13,7,10,8,4],sipregisterattributegett:[13,4],call:[0,2,4,5,6,7,8,9,10,11,12,13,14],python26:2,type:[1,4,5,8,9,10,11,12,13,14],until:[13,8],autogen:8,successful:4,relat:[5,10,2,13],notic:5,warn:[0,5,6,8],"__iter__":12,sipimportsymbol:4,must:[0,2,4,5,6,7,8,9,10,11,12,13,14],join:13,restor:4,arbitari:10,setup:3,work:[0,4,9,10,13,8],sipbadcallablearg:4,root:[10,2],could:[0,13,10],overrid:[0,13,10],give:[13,2],indic:[0,10],want:[0,13,7,8,3],sip_module_dict:11,slicelen:4,unsign:[12,8,4],end:[12,13,10,4],quot:8,ordinari:[5,13,14],how:[2,5,7,10,11,13],answer:13,place:[0,4,6,10,13,8],coff2omf:2,config:[0,13,3],bindir:2,updat:[8,4],after:[0,2,4,10,13,8],sipwrapp:[9,4],"_pkg_config":13,py_buff:10,befor:[0,4,6,10,13,8],wrong:12,nokeywordarg:8,arch:[0,2],parallel:6,demonstr:13,attempt:[10,4],opaqu:[12,4],c_mod:10,exclud:[0,10,8],maintain:[0,13],finalis:[0,13],exclus:[13,10],get_sip_api:11,order:[13,10,8,4],origin:[5,10,8],composit:10,over:[0,10],becaus:[5,13,7,10],privileg:2,keyboard:12,pyerr_setstr:10,delaydtor:8,easier:[0,13,6,4],this_word:13,thei:[0,7,9,10,12,13,8],fragment:[10,11],safe:[5,9,10,4],"break":[13,10],singleshot:8,choic:[5,13,10],bigetreadbuffercod:[12,10],unpickl:10,each:[0,2,4,6,7,10,11,13,8],debug:[0,6,10,2,14],bigetsegcountcod:[12,10],side:10,mean:[0,2,8,9,10,13,14],v1_0:10,v1_1:10,sipcanconverttomappedtyp:[9,4],sipemitslot:9,collector:[13,10,8,4],unbound:8,sip_nameerror:12,goe:5,newli:[13,9,8,4],pycobject:[11,4],content:[0,3,4,10,13,8],pyqtconfig:[0,13],allownon:8,build_fil:[0,13],situat:13,free:[13,2],standard:[2,3,5,7,10,13],"__setitem__":[12,8,4],voidptr:[8,14,4],precompil:10,foo_support:10,extra_cflag:0,v3_0:10,isn:[10,14,4],setwrit:14,"__or__":12,rang:[13,10,8,4],siperr:10,python26_bcpp:2,independ:10,restrict:[7,10,8],hook:3,unlik:[5,13,10],mingw:[0,2],messag:[0,6,2],wasn:4,sip_keyerror:12,iserr:4,top:[0,13],sometim:[12,13,7,8],fiction:13,mercuri:5,too:10,consol:[0,7],namespac:[5,12,10,4],tool:5,lower:[10,8,11,4],sipcanconverttotyp:[10,4],read_vers:0,reinterpret_cast:10,target:0,keyword:[5,10,6,8,13],provid:[0,4,5,6,8,7,10,12,13,14],zero:[0,4,8,7,10,13,14],sipexceptionref:10,matter:[12,13,10],wchar_t:[12,13,4],sip_lookuperror:12,modern:6,increment:[10,4],incompat:[1,4,9,10,13,8],sipwrappertyp:[10,4],pydict_getitemstr:11,simplifi:10,though:9,sipself:10,object:[0,1,4,5,8,9,10,11,12,13,14],lexic:4,letter:4,don:10,doc:[12,10,6],doe:[0,4,5,7,8,9,12,13,14],declar:[4,6,10,12,13,8],unchang:[10,4],dot:[12,10,8],"__str__":12,syntax:[1,5,6,12,13,8],qstring:[13,10],identifi:[10,8,4],siperror:[10,4],involv:4,absolut:0,pystring_fromstr:4,acquir:[13,10,4],configur:[0,1,2,5,7,9,13],sip_build:9,dd_name:8,qwidget:[13,10,8],"__call__":12,stop:4,report:10,bar:13,emb:11,baz:13,method:[0,4,5,6,7,8,9,10,12,13,14],sipclass:10,pyexc_valueerror:10,set_build_macro:0,result:[10,6,8,4],respons:[5,13,9,10,4],fail:[10,4],subject:13,sip_unicodetranslateerror:12,hopefulli:13,simplest:13,sip_zerodivisionerror:12,clean_build_file_object:0,handwritten:[1,4,9,10,11,12,8],accord:[13,7,4],extend:[5,13,10],sip_overflowerror:12,extens:[0,1,3,4,5,13],lazi:[1,13,4],preprocessor:[0,13,9,10,4],rtti:[10,4],protect:[0,4,5,6,7,10,12,13],expos:14,howev:[2,8,10,11,12,13,14],against:[0,13,10],sipfindclass:[9,4],logic:10,fno:2,com:[5,2],create_wrapp:0,seqlen:4,getwrit:14,setapi:[13,14],guid:[5,1],assum:[0,13,2,8,4],three:[0,13],been:[0,2,4,8,9,10,11,12,13,14],much:13,siptypeismap:4,interest:13,q_signal:12,"__len__":[12,8],sipconvertfrominst:[9,4],life:13,suppress:[8,4],argument:[0,1,4,5,6,7,9,10,12,13,8],child:13,"catch":[10,6],riverbankcomput:[5,2],wobj:10,qtcoremod:[13,10],ident:10,visitproc:10,properti:0,weren:9,"__ge__":12,have:[0,2,4,5,7,8,9,10,11,12,13,14],sip_slot_con:12,tabl:4,toolkit:5,sever:[5,4],sipselfwasarg:10,docvalu:8,receiv:12,suggest:13,make:[0,2,4,5,6,7,9,10,12,13,8],export_al:0,bigetbuffercod:[12,10],complex:[1,13],split:[13,6],sipgetsend:9,complet:[10,6,14],sip_api_major_nr:4,"__idiv__":12,rais:[0,13,10,14,4],ownership:[1,4,5,10,13,8],qaccel:12,tune:[0,13,2],redefin:[0,10,6,4],kept:[8,4],siptypeisclass:4,inherit:13,sip_importerror:12,thi:[0,2,4,5,6,7,8,9,10,12,13,14],endif:[13,10],programm:[12,10],everyth:13,left:[0,10,8],sip_keyboardinterrupt:12,protocol:[8,14,4],just:[0,3,4,9,10,13],gctraversecod:[12,10],previous:[9,4],easi:0,had:[5,9],sip_eoferror:12,qtguimod:[13,10],siptypeaspytypeobject:4,els:[13,10],save:4,opt:3,applic:[1,2,4,5,7,10,11,13,14],wai:[13,7,10,4],specif:[0,1,2,4,5,6,9,10,12,13,8],arbitrari:10,"__long__":12,sip_syntaxerror:12,cxxflag:2,underli:[12,8],www:[5,2],pymem_malloc:4,old:[13,9],deal:[12,13,10],sip_indentationerror:12,intern:[12,10,14],indirect:10,successfulli:[10,8],"__iand__":12,sipissubclassinst:9,buffer:[1,4,14,10,13,8],simplewrapp:[13,10,4],foo:[13,10,8],dd_next:8,"__ne__":12,sensibl:10,repositori:5,sipenum_:4,"super":[0,4,8,10,12,13,14],customw:7,pyarg_parsetupl:[12,10,4],py_modulegetdict:10,obj:[9,10,14,4],chronolog:0,"__mul__":12,produc:5,ppc:2,py_decref:10,regist:[13,4],"__dtor__":5,encod:[0,10,8,4],bound:[10,8,4],down:0,right:[0,10,11],"__and__":12,sipcanconverttoenum:4,often:[13,10,11],accordingli:13,suffici:3,segment:[13,10],support:[0,1,2,3,4,5,6,8,9,10,12,13,14],why:[13,10],avail:[2,3,4,5,9,10,12,13],reli:9,extra_cxxflag:0,siptransf:9,siptype_qpoint:10,gil:[10,6,8,13,4],qtcore:[0,10],"__isub__":12,form:[0,6,2,13],forc:8,heap:[13,10,14,4],"true":[12,1,14,8],arrays:8,sipgetpyobject:4,tell:13,sip_except:[12,10],minor:4,hierachi:13,sip_unicodeerror:12,emit:[12,8,4],featur:[0,1,5,6,9,10,12,13,8],initialisationcod:[12,13,10],classic:[12,1],sipforceconverttoinst:[9,4],"abstract":[5,10,8],exist:[0,2,4,6,10,14],trip:12,bmake:0,py_lib_dir:0,when:[0,1,2,4,5,6,8,10,11,12,13,14],test:4,asstr:14,intend:[0,13,10,11],sipenum_klass_enum:4,sipsimplewrapp:[9,10,4],longer:[9,10],sip_pyslic:[12,8],ignor:[0,4,14,10,13,8],sipcppptr:10,time:[0,4,5,6,8,10,13,14],leftmargin:0,sip_attributeerror:12,concept:[5,13],skip:[13,10],global:[1,4,5,6,10,12,13,8],signific:[10,6,8],supplement:10,raisecod:[12,10],"__rshift__":12,depend:[0,2,4,9,10,8],unpack:2,decim:0,riverbank:10,cobject:14,sip_mod_dir:0,sourc:[0,5,6,2,10],string:[0,4,8,10,12,13,14],extra_lib_dir:0,convertfromtypecod:[9,10],"__bool__":12,word:[13,10,11,3,8],exact:[12,13,10,8],administr:2,level:10,did:[0,9],gui:[0,5,7],pylist_new:10,"0x0001":14,sipstringtypeclassmap:4,dir:[0,6,2],prevent:[13,7,10,8,4],core:3,sipvoidptr_typ:4,sign:12,minimis:5,port:2,appear:[10,8],gcclearcod:[12,10],current:[0,13,10,8,4],qscintilla:6,sipdelayeddtor:8,iarr:[12,10],deriv:[0,1,4,7,10,11,12,13,8],gener:[0,1,2,4,5,6,8,9,10,11,12,13,14],explicitli:[2,5,8,9,10,12,13,14],address:[8,10,14,4],"__hex__":14,sip_runtimeerror:12,along:10,"__repr__":12,convertor:[9,4],extra:[0,13,6,8,4],modul:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14],prefer:10,pyobject_typecheck:4,sip_slot_di:12,instal:[0,1,2,5,7,13],sipregisterpytyp:[13,10,4],moduleheadercod:[12,10],memori:[4,5,14,10,13,8],univers:[0,2],visit:10,sipfindnamedenum:[9,4],siptypenam:4,msg:0,scope:[12,10,8,4],siptype_qtimerev:10,sip_pytupl:[12,10,8],scite:6,pyqwt:0,claus:[10,8],templat:[0,5,10,12,13],pyerr_except:10,uniqu:[10,4],descriptor:13,can:[0,2,3,4,5,6,7,8,9,10,11,12,13,14],purpos:[0,10,14,4],encapsul:[0,5],isdelet:14,occur:[0,10,8],alwai:[5,13,10,4],multipl:[10,2,8,13],"__license__":10,sipmalloc:[13,4],sip_protected_is_publ:[10,4],write:[0,4,5,7,10,13],pure:[0,2,5,10,13,8],sip_memoryerror:12,map:[1,4,5,10,12,13,8],"__next__":12,sipmodulemakefil:[0,13],mai:[0,2,4,5,6,8,7,10,12,13,14],underscor:[11,4],data:[5,12,10,11],practic:10,sipcallmethod:[9,10,4],sip_qobject:12,stdin:6,explicit:[12,10,8],inform:[0,5,6,10,12,13,14],"switch":10,preced:[0,8,11],combin:[0,10,4],callabl:[5,12,10],converttosubclasscod:[12,10,4],wrapinst:14,size_t:4,still:[13,9,10,7,8],pointer:[4,9,10,11,12,8],dynam:[13,7],entiti:10,conjunct:[10,8],disconnect:12,platform:[0,2,5,6,10,12,13],window:[0,2,5,6,7,13],main:[10,14],non:[0,4,7,10,13,8],"float":[12,8,4],siplenptr:10,contriv:10,initi:[10,4],qcustomev:10,now:[13,9,10,7],nor:10,introduct:[5,1],pykd:0,term:[5,10],name:[0,1,2,3,4,5,6,8,9,10,11,12,13,14],realist:13,transferback:[13,9,14,8,4],revers:13,revert:9,separ:[0,4,10,12,13,8],sipsimplewrapper_typ:4,sip_pycal:[12,8],compil:[0,2,4,5,6,9,10,12,13],sip_vers:[0,14,4],sip_standarderror:12,replac:[0,2,4,10,11,13],individu:[0,10],continu:10,wrap:[0,4,5,6,8,10,11,12,13,14],sipconvertfromsliceobject:4,happen:13,py_ssize_t:4,shown:10,settracemask:14,sipforceconverttomappedtyp:[9,4],space:0,"0x0010":14,bespok:0,correct:[2,4,7,10,13,8],earlier:[1,9,4],migrat:13,"byte":[8,10,14,4],unpredict:8,care:[0,13],setdefault:13,sipconverttovoidptr:4,thing:[13,10,14],pyslice_getindicesex:4,first:[0,4,6,10,12,13,14],oper:[5,8,9,10,12,13,14],reimplement:[0,10,8,4],directli:[11,4],onc:[2,8,4],arrai:[4,14,10,12,13,8],pyimport_importmodul:11,dump_object:10,open:10,sip_configur:[0,13],size:[0,2,4,6,8,10,14],given:[6,10,2,13,4],silent:10,convent:10,sippi:10,caught:[10,8],convention:13,conveni:[10,4],editor:6,especi:5,copi:[0,4,8,7,10,12,13,14],specifi:[0,2,4,5,8,10,12,13,14],pyqt4:[13,10,8],enclos:[10,6,4],than:[0,2,4,8,7,10,13,14],virtualcatchercod:[12,10,4],wide:[1,13,4],py_vers:0,were:[0,9],posit:[0,8],pre:10,sai:13,ani:[0,2,3,4,5,6,7,9,10,12,13,8],properli:[5,12,13],techniqu:7,sipconvertfromsequenceindex:4,note:[4,7,10,11,12,13,8],take:[0,2,7,10,12,13,8],noth:[12,10],begin:[10,4],sure:[10,2,13,4],trace:[6,14],normal:[0,3,4,7,8,9,10,13,14],multipli:8,sipforceconverttotyp:4,pair:[0,8],homepag:5,later:[5,13,14,4],picklecod:[12,10],show:[10,2,8,11],"0x020303":0,"__irshift__":12,slot:[5,12,8],sipgetst:[10,4],onli:[0,4,5,10,12,13,8],slow:0,activ:12,state:[10,14,4],api_export_symbol:11,dict:[0,4],variou:[2,14,4],get:[0,2,4,10,11,13,8],cannon:0,soon:10,cannot:[12,10,8,11],requir:[0,2,4,5,8,7,10,13,14],mybool:8,borrow:4,pynam:[10,8],hellomodulemakefil:13,where:[0,4,5,10,12,13,14],pytyp:4,prehook:8,sipcpp:[12,10],concern:9,arg_nr:4,detect:[13,10,4],sippytyp:10,accesscod:[12,10],enumer:4,label:13,between:[4,5,10,11,12,13,8],"import":[0,3,4,5,6,7,10,11,12,13,14],across:13,sipwrappercheck:11,parent:13,style:[0,9],cycl:[13,4],setcod:[12,10],come:4,"0x0020":14,programmakefil:0,sipresolvetypedef:4,mani:[5,13,2,8],among:3,acceler:12,undocu:10,period:10,exploit:[5,13,10],colon:8,build_command:0,default_bin_dir:0,mark:14,siparg:10,derefer:10,thousand:13,ascobject:14,sip_indexerror:12,"__eq__":12,those:[0,13,10,8,4],"case":[0,8,10,11,12,13,14],defaultmetatyp:[12,13,10],py_typ:4,"__mod__":12,sip_arithmeticerror:12,cast:[12,9,10,14,4],invok:[0,5,10,3],invoc:8,sipreleasetyp:[10,8,4],margin:0,advantag:10,stdout:0,support_foo:10,them:[0,5,9,10,13],worri:5,myapi:13,ascii:[10,8,4],concatan:8,"__init__":[0,13,7,10,14],develop:[0,2,4,5,13,14],etc:10,same:[0,3,4,7,8,9,10,12,13,14],check:[0,2,4,10,11,14],ispyown:14,binari:[0,10,2,12],html:10,document:[5,10,6,13],metatyp:[13,10,14,8],nest:10,sipmethod:[10,4],footprint:13,appropri:[0,10,2,8,4],macro:[0,13,2,4],without:[0,4,5,10,12,13,8],sipmappedtyp:4,dereferenc:8,"__int__":[12,14],execut:[0,2,5,6,8,10,13,14],tip:6,rest:[10,4],releasegil:[10,6,8,13],siptransferobj:10,tobj:10,struct:[12,13,10],except:[0,1,2,4,5,6,8,10,11,12,13,14],littl:[12,13],real:[12,10],around:[0,4,8,9,10,12,14],read:[0,12,10,8],swig:5,world:13,part:[0,4,5,7,8,9,10,12,13,14],sip_ssize_t:[10,4],saniti:11,whitespac:[13,10],integ:[0,4,14,10,12,8],either:[0,2,3,4,8,10,13,14],output:10,manag:[1,10,8,13,4],wrappertyp:[13,10,14,4],pyconfig:0,ascend:4,slice:[12,4],definit:[1,4,5,10,12,8],siperrorfail:10,sip_assertionerror:12,exit:[0,8],notabl:6,freed:[13,4],mname:0,garbag:[13,10,8,4],cppptr:4,fulli:[0,4],immut:4,"throw":[12,10,8],comparison:[5,9],methodcod:[12,10,8,4],sip_stopiter:12,sipprotectvirt_foo:10,processor:10,slash:8,strip:0,pyobject_callobject:4,your:[0,1,2,3,5,7,9,13],macos_platform:10,generate_target_default:0,fast:5,mingw32:13,area:4,aren:13,hex:8,modulemakefil:[0,7],start:[0,4,5,8,10,13,14],compliant:4,interfac:[1,10,13],prot_is_publ:0,lot:0,timelin:[0,10,6,12,13],"__invert__":12,tupl:[0,12,10,8,4],py_end_allow_thread:[12,10],nmake:13,rightmargin:0,"default":[0,2,6,8,10,12,13,14],pylist_get_s:10,"__le__":12,embed:[1,10,11],deadlock:13,holdgil:[10,6,8,13],expect:[13,9,10,8,4],creat:[0,2,3,4,5,8,7,10,13,14],certain:[10,8,4],a0kei:10,file:[0,1,2,3,4,5,6,7,9,10,11,12,13,8],sip_taberror:12,again:[13,10,8],readi:0,q_object:13,reduct:6,tight:5,valid:[0,13,10,4],pathnam:0,you:[0,2,3,4,5,7,8,9,10,12,13,14],architectur:[0,2],noderiv:8,sequenc:[0,8,4],symbol:[0,10,9,2,4],docstr:[5,10,6,12,8],track:13,reduc:[13,2],directori:[0,2,3,5,6,7,10,13],descript:[0,10,6,12,4],stdexcept:10,py_initmodul:10,potenti:[1,9,10,13],cpp:[6,3,4],dst:0,represent:[0,10],all:[0,2,4,5,6,8,10,12,13,14],unencod:[10,8],capsul:14,sipconvertfrommappedtyp:[9,4],follow:[0,2,3,4,5,7,8,9,10,11,12,13,14],ptr:10,qt_4_2_0:13,"__cmp__":12,program:[0,13,14],sip_ioerror:12,sip_feature_:10,dd_isderiv:8,setdelet:14,introduc:[13,9],sipvisit:10,liter:13,far:9,util:[5,10],mechan:[5,13],fall:4,veri:[13,10],sipcppret:10,list:[0,2,3,5,6,10,12,13,8],posthook:8,siptypescop:4,adjust:0,hello_sip_flag:13,stderr:[0,10],small:[5,13],py_begin_allow_thread:[12,10],py_inc_dir:0,platform_lib:0,ten:13,interpretor:13,pyobject:[12,10,11,4],keeprefer:8,"__truediv__":[12,9],design:[5,8],pass:[0,4,6,7,9,10,11,13,8],what:[5,13,10],sub:[0,2,4,5,8,10,13,14],sipconverttoinst:[9,4],section:[9,10,8,4],abl:7,overload:[5,10],delet:[10,14],version:[0,1,2,3,4,5,6,8,9,10,12,13,14],"public":[0,4,6,10,12,13],hasn:[10,4],full:[0,2,4,5,6,10,12,13],themselv:10,sipfindmappedtyp:[9,4],sophist:5,behaviour:[13,9,10],sip_vmserror:12,modifi:[0,7],valu:[0,2,4,8,7,10,12,13,14],search:[10,6,13],helloconfig:13,"__xor__":12,prior:[9,10,4],amount:[10,8],via:[8,4],deprec:[4,5,8,9,10,14],inappropri:4,sipbadlengthforslic:4,select:13,hexadecim:[0,14,4],win32_platform:10,sip_sign:12,two:[0,2,9,10,12,13],taken:[0,10,4],sip_oserror:12,more:[0,1,2,4,6,10,13,8],desir:[10,8],sip_block_thread:[10,4],c_api:11,hundr:13,ital:10,flag:[0,5,10,13,4],bireleasebuffercod:[12,10],particular:[0,7,9,10,13,8],known:[14,4],destin:0,cach:4,none:[0,13,10,14,8],sipprotect_foo:10,remain:[12,10,4],pylist_check:10,v2_0:10,def:13,share:[5,4],accept:8,sipreleaseinst:[9,4],cours:11,newlin:0,rather:[0,4,8,7,10,13,14],anoth:[0,4,5,8,10,13,14],siperrorcontinu:10,divis:[12,1],sipinttypeclassmap:4,simpl:[0,1,3,5,12,13],referenc:[10,11,4],api_wrapper_check:11,sip_windowserror:12,compulsori:[10,8],sipconfig:[0,5,7,2,13],generate_target_instal:0,associ:[13,8,10,14,4],circumst:14,"short":[12,10,8,4],qtgui:[0,13,10],required_str:0,children:13,caus:[2,4,6,14,13,8],callback:5,help:[0,5,6,2],a_mod:10,i386:2,through:[0,10],hierarchi:[12,13,10,4],implicitli:[9,14,8],paramet:[0,8,6,14,4],typedef:[12,1,10,8,4],scon:0,might:[0,12,10,8,13],good:[10,2],"return":[0,4,8,10,11,13,14],timestamp:[10,8],exportedheadercod:[12,10],framework:0,somebodi:13,converttotypecod:[12,9,10,8,4],complain:8,"0x0008":14,easili:10,alreadi:[8,10,14,11,4],compris:5,found:[0,13,4],unicod:[13,10,8,4],"0x0004":14,inplac:[12,10],"0x0002":14,hard:13,idea:2,connect:[5,12,8],notypenam:8,event:10,setsiz:14,publish:13,print:10,occurr:10,siptype_klass:[10,4],qualifi:[10,4],sipwrapper_typ:4,reason:[13,10],base:[0,4,5,10,12,14],sbf:13,ask:10,earliest:[0,10],pylist_get_item:10,thread:[0,5,10,8,13],pycobject_check:11,omit:[12,10,6,8],perhap:7,lifetim:5,assign:[13,4],siptypeisnamespac:4,major:[2,4],default_mod_dir:[0,13],obviou:13,upper:[10,8,4],number:[0,1,2,4,5,6,8,10,12,13,14],extern:[5,10,8],done:[13,10],construct:[13,10],stabl:5,miss:9,build_ext:3,"__float__":12,gpl:[5,10],differ:[0,2,5,8,9,10,12,13,14],script:[0,2,3,5,7,10,13],interact:13,least:13,mfile:0,"__ixor__":12,store:10,option:[0,2,3,4,5,6,7,8,9,10,13,14],relationship:[13,4],siptransferbreak:[13,4],getter:[13,4],pars:[0,10,8],std:10,version_to_sip_tag:0,cyclic:[13,10,8,4],remov:[0,13,9,8,4],sip_api_minor_nr:4,str:8,consumpt:5,chkdir:0,comput:[10,8],create_config_modul:[0,13],tp_name:[8,4],packag:[0,10,7,2,8],"null":[10,11,4],sipkwd:10,"0x040000":[0,14,4],built:[0,5,7,10,2],lib:[13,2],self:[0,13,10],"__div__":[12,9],also:[0,2,4,5,6,7,10,11,13,8],build:[0,1,2,3,4,5,6,7,10,13],distribut:[5,7,2],exec:8,klassinst:10,previou:[13,8,10,14,4],defaultencod:[12,10,8],most:[12,10,6,14,4],maco:[0,5,2],addr:14,clear:10,cover:[5,10,2,13],transferobj:4,supertyp:[13,10,8],extra_lflag:0,latest:[0,5,10,2],microsoft:2,getcod:[12,10],particularli:14,sip_rxobj_con:[12,8],unitcod:[12,10],fine:[0,13,2],find:[5,13,8],copyright:[5,10],keyreleas:10,express:[0,12,10],py_non:[10,4],mappedtyp:[12,10],setdata:10,"_c_api":11,catcher:10,whenev:[13,9,10,8],common:[5,10,14],sip_unboundlocalerror:12,noreleas:8,set:[0,2,4,5,6,8,10,11,13,14],dump:14,mutabl:[14,4],extra_include_dir:0,sipr:10,arg:4,"__imod__":12,pythonw:7,call_exec:8,someth:[13,9,2],siptypeisenum:4,smallest:0,subdir:0,altern:[5,13,8],signatur:[4,5,6,9,10,12,8],latin:[10,8,4],numer:[0,8],disallow:[10,4],sipiserr:10,complementari:[5,9],popul:[13,10,4],both:[0,4,5,10,12,13,8],last:[12,13,10,8],license:[10,8],operat:12,context:[12,10,8,4],connectitem:12,load:[0,5,7,14],sipclass_klass:[10,4],simpli:[13,10],point:[4,14,10,12,13,8],instanti:[10,8],header:[0,2,5,10,11,13],linux:[5,6,7,2],throughout:10,compositemodul:[12,10],static_cast:10,empti:0,destructor:[4,5,8,10,12,13,14],extra_defin:0,strategi:13,sipconvertfromnamedenum:[9,4],convert:[0,2,4,6,10,11,13,8],sipreskei:10,understand:[5,12,14],"__lshift__":12,nodefaultctor:8,look:[6,7,2,8,13],sipreleasemappedtyp:[9,4],abov:[0,8,3],error:[0,10,8,4],"__hash__":12,anonym:4,sip_pylist:[12,8],sip_slot:12,readm:2,itself:[4,5,7,10,12,13],pytypeobject:[10,4],pyqt_sip_flag:13,sipmapstringtoclass:4,conflict:[13,6],behav:13,sym:4,temporari:[10,8,4],user:[9,7,4],"__add__":[12,10],wherev:10,chang:[0,4,5,9,10,13,8],travers:10,task:13,equival:[0,12,10,14,8],entri:[8,4],parenthes:4,pickl:10,sipflag:10,"__neg__":12,sip_rxobj_di:12,explan:10,getapi:14,dump_klass:10,siperrornon:10,restructuredtext:10,appli:[13,9,10,8,4],subsequ:[5,13,10,4],sip_pytyp:[12,8],format:[0,2,4,9,10,8],"__gt__":12,bit:14,pystring_fromstringands:10,formal:12,semi:12,signal:[5,12,8,4],resolv:0,collect:[12,13,10,8,4],api:[0,1,4,5,6,7,8,9,10,11,12,13,14],maplen:4,version_to_str:0,nbyte:4,sip_floatingpointerror:12,creation:5,some:[4,5,6,8,7,10,12,13,14],back:[0,8],siptype_qwidget:10,transferthi:[13,8],pep:4,larg:[5,13,10],recognis:10,pystring_asstringands:10,run:[5,10,2,3,13],siptransferto:[13,14,4],reach:13,step:[2,4],impos:10,sipconverttomappedtyp:[9,4],idx:4,block:[5,6,14,10,13,8],primarili:8,within:[10,8,4],ellipsi:8,hex_:8,ensur:[0,4,5,10,13,8],next:[10,7,2,8,13],question:13,"long":[12,6,8,4],custom:[0,1,7,2],handler:[13,4],sipseg:10,suit:0,forward:8,doctyp:8,sipmoduledict:10,siptype_qkeyev:10,link:[0,13,7,10,8],translat:10,line:[0,1,2,3,6,7,8,9,10,12,13,14],sdk:[0,2],getwrapp:[10,8],concaten:10,utf:[10,8,4],consist:12,bigetcharbuffercod:[12,10],py_buildvalu:[10,4],similar:[5,13,8,4],install_fil:0,sipconvertfromconstvoidptr:4,newthread:8,dd_list:8,sip_unicodeencodeerror:12,parser:[12,13,8],doesn:[0,12,10,13,4],repres:[0,4,14,12,13,8],"char":[12,13,10,8,4],sipdir:2,sipmodul:10,invalid:0,keywordarg:8,bracket:[10,4],librari:[0,2,5,6,7,10,12,13,14],clean:0,eval:4,unaffect:4,an_object_refer:9,leak:[13,10,8,4],hello:13,sip_referenceerror:12,install_dir:0,code:[0,1,2,4,5,6,8,9,10,11,12,13,14],sipconvertfromenum:4,results:8,qtguimodulemakefil:13,the_word:13,privat:[5,12,8,13],sens:12,generate_target_clean:0,sip_valueerror:12,sip_no_convertor:[10,4],typeheadercod:[12,13,10],sipconnectrx:9,siperrorfail1:10,relev:5,tri:[10,8],sipbuildresult:[9,4],"try":[10,6,14,13],refer:[0,1,4,5,8,10,11,13,14],sub_cfg:[0,13],sipdistutil:[5,3],impli:[0,8],smaller:13,cfg:[13,3],contructor:10,download:[5,1,2],append:[0,10,2,13],compat:[0,10,2,8,4],index:4,defaultsupertyp:[12,13,10],access:[0,4,5,6,10,12,13],sipexception_:4,consolid:[5,10],parse_build_macro:0,len:4,bodi:10,let:13,becom:[11,4],great:5,convers:[4,5,9,10,12,8],broken:4,pycobject_asvoidptr:11,typic:[0,13,9,10],chanc:13,siptype_typ:10,sip_not_non:[10,4],"boolean":[12,8,4],sipptrptr:10,sipexception_klass_except:4,from:[0,2,3,4,5,6,7,9,10,11,12,13,8],zip:2,doubl:[12,8,4],qobject:[12,13,10],implic:13,few:12,sip_unblock_thread:[10,4],sort:[13,6,4],rich:5,src:0,greatli:10,augment:0,annot:[1,4,6,9,10,12,13,8],bigetwritebuffercod:[12,10],obvious:13,thin:[12,4],proprietari:7,control:[13,10,4],sipgetwrapp:[9,4],tar:2,process:[5,10,3],lock:[1,4,5,6,10,13,8],tag:[0,13,6],fprintf:10,msvc:0,delai:8,gcc:2,sip:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14],sit:0,pyqt:[0,5,9,10,13],"__pos__":12,instead:[12,13,10,8,4],preinitialisationcod:[12,10],overridden:10,pymodule_getdict:11,alloc:[13,4],bind:[0,2,5,6,13,14],correspond:[0,2,4,5,10,11,12,13,8],element:[0,12,10,8,4],issu:[5,13,8],siperrorst:[10,4],allow:[0,2,4,5,7,9,10,12,13,8],siptypefrompytypeobject:4,typecod:[12,10],siptransferback:[13,14,4],comma:[12,13,8],py_conf_inc_dir:0,sipconvertfromnewinst:[9,4],destroi:[13,10,8,4],srcdir:0,therefor:[5,13],sipfre:[13,4],crash:[13,14],greater:[0,8,10,14,4],"__getitem__":[12,8],python:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14],auto:6,generate_macros_and_rul:0,nokia:5,qmake:0,"__delitem__":[12,8],postinitialisationcod:[12,10],anyth:8,modulecod:[12,10,8],subset:12,meta:[1,4,5,10,13,8],"static":[0,2,4,5,7,10,12,13],sipklass:[12,4],our:[13,3],special:[12,9,3],out:[5,13,2,8,4],variabl:[1,5,10,12,13,8],influenc:4,stub:[7,10],suitabl:5,rel:0,leverag:3,vendorid:7,q_slot:12,standalon:10,qtmod:10,dictionari:[0,4,10,11,12,13],releas:[2,4,5,6,10,13,8],afterward:[10,6,8],unnam:[10,14,8],opengl:0,timer:10,keep:[13,10],sipconvertfromnewtyp:4,length:[5,10,4],outsid:12,optional_list:0,softwar:[5,2],suffix:6,date:[13,2],owner:[14,4],parse_build_fil:0,facil:[0,6],typestr:4,transferto:14,dd_ptr:8,unknown:[14,8],licens:[5,1,10,12,8],sipparseresult:[9,10,4],system:[0,1,2,3,4,5,6,7,13],wrapper:[0,4,5,6,8,10,12,13,14],attach:10,termin:[13,10,8,4],"final":[10,2,13],sipclass_:4,"__del__":14,sip_systemexit:12,exactli:10,cmodul:[12,13,10],qevent:10,bother:13,see:[0,2,3,4,5,6,10,11,12,13,8],structur:[1,4,5,6,8,9,10,11,13,14],charact:[0,1,4,9,10,12,13,8],nocopi:8,slicelength:4,sipapidef:11,linker:[0,5,13],clearli:10,clib:0,sip_inc_dir:0,pyqt_sip_dir:13,need:[0,2,3,4,5,6,7,9,10,11,12,13,8],turn:10,tidi:10,verbatim:13,sip_typeerror:12,"0x04":4,"0x01":4,"0x02":4,builtin:[0,1,2,8,7,14],"_qt":10,which:[0,2,3,4,5,6,7,8,9,10,12,13,14],singl:[0,5,10,12,13],regard:[13,10,8,4],unless:[10,8],clash:[10,8],deploy:[13,10],pyd:5,"class":[0,1,4,5,6,8,7,10,12,13,14],siptype_:4,request:4,snapshot:[0,14,4],determin:[13,8,10,14,4],siptyp:10,constrain:[9,8],keypress:10,fact:5,extra_lib:[0,13],a0wrapp:10,text:[0,13,10],bring:5,sip_unicodedecodeerror:12,dbu:10,anywai:[10,8],locat:[13,4],sip_config_arg:0,should:[0,2,4,7,9,10,12,13,8],local:[10,3],hope:13,meant:[9,8],memcpi:10,increas:0,extract:[0,5,10],enabl:[0,4,6,8,10,13,14],sipconverttotyp:[10,4],possibl:[5,12,10,14,8],integr:[5,8],contain:[0,4,5,6,7,10,11,12,13,8],pylong_asunsignedlong:4,attribut:[0,1,13,11,4],sipexportsymbol:[11,4],sipwrappertype_typ:4,pyobject_print:10,correctli:[12,13],pattern:[0,10],dll:13,written:[0,5],neither:13,kei:[0,13,10],"__ifloordiv__":12,job:10,strdefin:0,"__ilshift__":12,addit:[0,1,4,9,10,12,13,8],consolidatedmodul:[12,10,6],use_arch:0,equal:[13,8,10,14,4],"__ior__":12,instanc:[0,4,5,8,10,11,12,13,14],comment:7,hyphen:8,py_xdecref:10,respect:[13,4],siplong_asunsignedlong:4,compon:[5,1,6,2,10],treat:[14,8],immedi:[10,8],"__itruediv__":12,ob_typ:4,togeth:5,sipbuff:10,dstdir:0,"__iadd__":12,defin:[0,2,4,5,8,9,10,11,12,13,14],typeint:4,"__floordiv__":12,"__sub__":12,noargpars:[10,8],helper:[10,4],reacquir:[10,6,8],sip_version_str:[0,14,4],sipattrgetterfunc:4,sip_temporari:[10,8],unneed:[0,10],member:[12,9,10,8,11],handl:[0,8,7,10,13,14],sip_environmenterror:12,http:[5,2],sipmapinttoclass:4,effect:[12,13,10],dealloc:10,distutil:[0,1,13,3,5],sipisapien:4,firstli:13,whole:13,ext_modul:3,exampl:[0,1,2,3,4,7,10,11,12,13,8],command:[0,1,2,3,6,7,8,9,10,13,14],choos:[5,10,8],undefin:10,usual:[0,10,8,3,4],unari:12,less:[13,10,8,4],obtain:[8,11,4],optional_str:0,"__lt__":12,prepend:10,field:8,makefil:[0,13,7,6],sip_anyslot:12,add:[13,10],ws_win:13,match:[5,12,10,8,13],sip_bin:[0,13],piec:10,siptypedef:[10,4],know:[12,10],recurs:10,insert:0,pyerr_occur:4,like:[2,4,7,9,10,13,8],success:4,build_macro:0,necessari:[0,5,9,10,11,12,13],suppli:[13,8,4],destdir:2,"export":[0,10,11,4],sippyself:10,win32:2,borland:2,"__contains__":12,qlist:10,avoid:[0,10,6,8,13],numdefin:0,overlap:8,leav:13,hello_sip_dir:13,sipconvertfromconstvoidptrands:4,"enum":[1,4,9,10,11,12,8],although:2,offset:4,stage:7,about:[5,6,14,8],actual:[13,10,8,11],"__imul__":[12,10],sipconverttocpp:9,statement:[12,10,6,14],includ:[0,2,4,5,6,8,10,11,12,13,14],constructor:[0,4,6,8,10,12,13,14],fals:12,discard:8,disabl:[0,6,10,2,14],own:[0,5,8,7,10,13,14],sipwrapper_check:[9,4],automat:[0,4,5,6,8,9,10,13,14],pyqtwrappertyp:10,"__abs__":12,merg:[13,10],transfer:[13,9,10,8,4],sip_notimplementederror:12,sipconvertfromvoidptr:4,sip_modul:11,"function":[0,1,4,5,6,8,9,10,11,12,13,14],unexpect:4,sip_systemerror:12,neutral:0,sipfindtyp:[11,4],bug:4,count:[13,10,4],made:[13,10,8,4],parentmakefil:0,whether:10,wish:2,writeabl:[14,4],displai:[0,6,2,14],limit:[13,10],otherwis:[10,2,8,4],problem:[0,13,8],"int":[12,9,10,8,4],mask:14,dure:[0,5,10,6],sipbadcatcherresult:4,filenam:[0,10],posix_platform:10,implement:[0,4,5,6,8,9,10,12,13,14],sipexception_std_except:10,mutual:[13,10],sip_pyobject:[12,8],detail:[0,2,4,5,10,12,13,8],virtual:[4,5,8,10,12,13,14],other:[0,2,4,5,10,12,13,8],bool:[12,8,10,14,4],futur:14,rememb:10,unwrapinst:14,repeat:8,pyerr_setnon:10,exporteddoc:[12,10,6],singleton:8,optionalinclud:[12,10],rule:0,klass:[12,10,4],"__index__":12,sipclassnam:[9,4]},titles:["The Build System","SIP Reference Guide","Installation","Building Your Extension with distutils","C API for Handwritten Code","Introduction","The SIP Command Line","Builtin Modules and Custom Interpreters","Annotations","Potential Incompatibilities with Earlier Versions","Directives","Using the C API when Embedding","SIP Specification Files","Using SIP","Python API for Applications"],modules:{sipconfig:0,sip:14},descrefs:{"":{sipGetState:[4,0],sipTransferTo:[4,0],SIP_VERSION:[4,3],sipSimpleWrapper:[4,5],sipFindMappedType:[4,0],SIP_API_MAJOR_NR:[4,3],sipLong_AsUnsignedLong:[4,0],sipConvertFromEnum:[4,0],sipIntTypeClassMap:[4,5],dd_name:[8,6],sipConvertFromInstance:[4,0],sipReleaseType:[4,0],SIP_NO_CONVERTORS:[4,3],sipTypeName:[4,0],sipConvertToInstance:[4,0],sipMapIntToClass:[4,0],sipFindType:[4,0],sipConvertFromType:[4,0],sipTypeIsEnum:[4,0],sipSimpleWrapper_Type:[4,8],sipConvertFromSliceObject:[4,0],sipForceConvertToMappedType:[4,0],sipTypeIsNamespace:[4,0],sipConvertToVoidPtr:[4,0],sipCanConvertToType:[4,0],sipCanConvertToInstance:[4,0],sipConvertFromConstVoidPtrAndSize:[4,0],typeString:[4,6],sipForceConvertToType:[4,0],dd_next:[8,6],sipExportSymbol:[4,0],sipBadLengthForSlice:[4,0],sipConvertToMappedType:[4,0],sipTypeAsPyTypeObject:[4,0],sipIsAPIEnabled:[4,0],sipTypeFromPyTypeObject:[4,0],sipForceConvertToInstance:[4,0],sipConvertFromVoidPtrAndSize:[4,0],sipReleaseMappedType:[4,0],sipStringTypeClassMap:[4,5],SIP_API_MINOR_NR:[4,3],sipVoidPtr_Type:[4,8],sipFree:[4,0],sipRegisterAttributeGetter:[4,0],sipConvertToType:[4,0],sipWrapperType:[4,5],sipConvertFromNewType:[4,0],SIP_PROTECTED_IS_PUBLIC:[4,3],dd_ptr:[8,6],sipConvertFromSequenceIndex:[4,0],SIP_VERSION_STR:[4,3],sipTypeIsMapped:[4,0],SIP_NOT_NONE:[4,3],sipClassName:[4,0],sipMapStringToClass:[4,0],sipWrapperType_Type:[4,8],sipConvertFromNewInstance:[4,0],sipTransferBack:[4,0],sipMalloc:[4,0],sipConvertFromMappedType:[4,0],sipWrapper:[4,5],dd_isderived:[8,6],sipConvertFromConstVoidPtr:[4,0],sipTypeIsClass:[4,0],sipBadCatcherResult:[4,0],sipGetPyObject:[4,0],SIP_UNBLOCK_THREADS:[4,3],sipDelayedDtor:[8,5],sipReleaseInstance:[4,0],sipWrapper_Check:[4,0],sipTransferBreak:[4,0],typeInt:[4,6],sipTypeScope:[4,0],sipImportSymbol:[4,0],sipDelayedDtors:[8,0],sipFindClass:[4,0],sipResolveTypedef:[4,0],sipConvertFromNamedEnum:[4,0],SIP_BLOCK_THREADS:[4,3],sipGetWrapper:[4,0],sipBadCallableArg:[4,0],sipFindNamedEnum:[4,0],user:[4,6],sipCanConvertToEnum:[4,0],sipCanConvertToMappedType:[4,0],sipWrapper_Type:[4,8],sipCallMethod:[4,0],sipParseResult:[4,0],sipBuildResult:[4,0],sipRegisterPyType:[4,0],SIP_SSIZE_T:[4,3],sipConvertFromVoidPtr:[4,0]},"sipconfig.PythonModuleMakefile":{generate_target_install:[0,1],generate_macros_and_rules:[0,1],"__init__":[0,1]},sip:{transferto:[14,2],getapi:[14,2],settracemask:[14,2],setdeleted:[14,2],dump:[14,2],transferback:[14,2],SIP_VERSION_STR:[14,9],ispyowned:[14,2],wrapper:[14,7],cast:[14,2],unwrapinstance:[14,2],setapi:[14,2],wrapinstance:[14,2],SIP_VERSION:[14,9],voidptr:[14,7],wrappertype:[14,7],isdeleted:[14,2],"delete":[14,2]},"sip.voidptr":{"__int__":[14,1],getwriteable:[14,1],setwriteable:[14,1],ascobject:[14,1],ascapsule:[14,1],getsize:[14,1],"__hex__":[14,1],asstring:[14,1],setsize:[14,1],"__init__":[14,1]},"sipconfig.ProgramMakefile":{generate_target_default:[0,1],build_command:[0,1],generate_macros_and_rules:[0,1],generate_target_clean:[0,1],generate_target_install:[0,1],finalise:[0,1],"__init__":[0,1]},"sipconfig.ParentMakefile":{generate_target_clean:[0,1],generate_target_install:[0,1],generate_target_default:[0,1],generate_macros_and_rules:[0,1],"__init__":[0,1]},sipconfig:{create_config_module:[0,2],ModuleMakefile:[0,7],Configuration:[0,7],create_wrapper:[0,2],version_to_sip_tag:[0,2],format:[0,2],parse_build_macros:[0,2],create_content:[0,2],ParentMakefile:[0,7],Makefile:[0,7],read_version:[0,2],inform:[0,2],error:[0,2],version_to_string:[0,2],ProgramMakefile:[0,7],SIPModuleMakefile:[0,7],PythonModuleMakefile:[0,7]},"sipconfig.ModuleMakefile":{generate_target_default:[0,1],generate_macros_and_rules:[0,1],generate_target_clean:[0,1],module_as_lib:[0,1],generate_target_install:[0,1],finalise:[0,1],"__init__":[0,1]},"sipconfig.Makefile":{chkdir:[0,4],platform_lib:[0,1],install_file:[0,1],ready:[0,1],extra_libs:[0,4],"__init__":[0,1],generate_target_default:[0,1],console:[0,4],generator:[0,4],extra_include_dirs:[0,4],clean_build_file_objects:[0,1],mkdir:[0,4],extra_cflags:[0,4],rm:[0,4],extra_lib_dirs:[0,4],config:[0,4],finalise:[0,1],required_string:[0,1],extra_cxxflags:[0,4],extra_lflags:[0,4],parse_build_file:[0,1],generate_target_clean:[0,1],copy:[0,4],generate_target_install:[0,1],generate:[0,1],optional_string:[0,1],optional_list:[0,1],generate_macros_and_rules:[0,1],extra_defines:[0,4]},"sipconfig.SIPModuleMakefile":{finalise:[0,1],"__init__":[0,1]},"sipconfig.Configuration":{set_build_macros:[0,1],default_mod_dir:[0,4],default_bin_dir:[0,4],platform:[0,4],universal:[0,4],sip_version:[0,4],sip_config_args:[0,4],default_sip_dir:[0,4],sip_mod_dir:[0,4],build_macros:[0,1],py_inc_dir:[0,4],sip_inc_dir:[0,4],py_conf_inc_dir:[0,4],py_version:[0,4],py_lib_dir:[0,4],arch:[0,4],sip_version_str:[0,4],"__init__":[0,1],sip_bin:[0,4]}},filenames:["build_system","index","installation","distutils","c_api","introduction","command_line","builtin","annotations","incompatibilities","directives","embedding","specification_files","using","python_api"]})
\ No newline at end of file +Search.setIndex({desctypes:{"0":"cfunction","1":"method","2":"function","3":"cmacro","4":"attribute","5":"ctype","6":"cmember","7":"class","8":"cvar","9":"data"},terms:{sipcanconverttoinst:[9,4],sipconvertfromtyp:[10,4],secondli:13,prefix:[0,13,10,11,4],mkcustom:7,whose:[13,8,4],accur:12,"const":[4,10,11,12,13,8],cmdclass:3,pylist_set_item:10,under:[0,5,10,2],qlabel:13,everi:[0,13],ascapsul:14,"void":[4,14,10,12,13,8],affect:[0,10],"__nonzero__":12,factori:[13,8,4],sip_pydict:[12,8],initialis:[0,13,10],sipconvertfromvoidptrands:4,abil:[0,5],direct:[0,1,4,6,10,12,13,8],second:0,b_mod:10,module_as_lib:0,even:[12,9,10],neg:[0,14,4],qpoint:10,"new":[3,4,5,8,10,12,13,14],net:0,ever:8,sipdisconnectrx:9,getsiz:14,q_os_win:13,mem:4,never:[13,10,8,4],here:[5,12],debugg:8,path:[13,2,3],interpret:[0,1,2,4,5,6,7,10,11,12,13,8],incdir:2,adopt:10,create_cont:0,create_word:13,sip_derived_class:10,mkdir:0,default_sip_dir:[0,13],unix:[0,5,7,13],pythonmodulemakefil:0,total:10,unit:10,describ:[3,4,5,6,7,9,10,12,13,8],would:[13,7,10,8,4],sipregisterattributegett:[13,4],call:[0,2,4,5,6,7,8,9,10,11,12,13,14],python26:2,type:[1,4,5,8,9,10,11,12,13,14],until:[13,8],autogen:8,successful:4,relat:[5,10,2,13],notic:5,warn:[0,5,6,8],"__iter__":12,sipimportsymbol:4,must:[0,2,4,5,6,7,8,9,10,11,12,13,14],join:13,restor:4,arbitari:10,setup:3,work:[0,4,9,10,13,8],sipbadcallablearg:4,root:[10,2],could:[0,13,10],overrid:[0,13,10],give:[13,2],indic:[0,10],want:[0,13,7,8,3],sip_module_dict:11,slicelen:4,unsign:[12,8,4],end:[12,13,10,4],quot:8,ordinari:[5,13,14],how:[2,5,7,10,11,13],answer:13,place:[0,4,6,10,13,8],coff2omf:2,config:[0,13,3],bindir:2,updat:[8,4],after:[0,2,4,10,13,8],sipwrapp:[9,4],"_pkg_config":13,py_buff:10,befor:[0,4,6,10,13,8],wrong:12,nokeywordarg:8,arch:[0,2],parallel:6,demonstr:13,attempt:[10,4],opaqu:[12,4],c_mod:10,exclud:[0,10,8],maintain:[0,13],finalis:[0,13],exclus:[13,10],get_sip_api:11,order:[13,10,8,4],origin:[5,10,8],composit:10,over:[0,10],becaus:[5,13,7,10],privileg:2,keyboard:12,pyerr_setstr:10,delaydtor:8,easier:[0,13,6,4],this_word:13,thei:[0,7,9,10,12,13,8],fragment:[10,11],safe:[5,9,10,4],"break":[13,10],singleshot:8,choic:[5,13,10],bigetreadbuffercod:[12,10],unpickl:10,each:[0,2,4,6,7,10,11,13,8],debug:[0,6,10,2,14],bigetsegcountcod:[12,10],side:10,mean:[0,2,8,9,10,13,14],v1_0:10,v1_1:10,sipcanconverttomappedtyp:[9,4],sipemitslot:9,collector:[13,10,8,4],unbound:8,sip_nameerror:12,goe:5,newli:[13,9,8,4],pycobject:[11,4],content:[0,3,4,10,13,8],pyqtconfig:[0,13],allownon:8,build_fil:[0,13],situat:13,free:[13,2],standard:[2,3,5,7,10,13],"__setitem__":[12,8,4],voidptr:[8,14,4],precompil:10,foo_support:10,extra_cflag:0,v3_0:10,isn:[10,14,4],setwrit:14,"__or__":12,rang:[13,10,8,4],siperr:10,python26_bcpp:2,independ:10,restrict:[7,10,8],hook:3,unlik:[5,13,10],mingw:[0,2],messag:[0,6,2],wasn:4,sip_keyerror:12,iserr:4,top:[0,13],sometim:[12,13,7,8],fiction:13,mercuri:5,too:10,consol:[0,7],namespac:[5,12,10,4],tool:5,lower:[10,8,11,4],sipcanconverttotyp:[10,4],read_vers:0,reinterpret_cast:10,target:0,keyword:[5,10,6,8,13],provid:[0,4,5,6,8,7,10,12,13,14],zero:[0,4,8,7,10,13,14],sipexceptionref:10,matter:[12,13,10],wchar_t:[12,13,4],sip_lookuperror:12,modern:6,increment:[10,4],incompat:[1,4,9,10,13,8],sipwrappertyp:[10,4],pydict_getitemstr:11,simplifi:10,though:9,sipself:10,object:[0,1,4,5,8,9,10,11,12,13,14],lexic:4,letter:4,don:10,doc:[12,10,6],doe:[0,4,5,7,8,9,12,13,14],declar:[4,6,10,12,13,8],unchang:[10,4],dot:[12,10,8],"__str__":12,syntax:[1,5,6,12,13,8],qstring:[13,10],identifi:[10,8,4],siperror:[10,4],involv:4,absolut:0,pystring_fromstr:4,acquir:[13,10,4],configur:[0,1,2,5,7,9,13],sip_build:9,dd_name:8,qwidget:[13,10,8],"__call__":12,stop:4,report:10,bar:13,emb:11,baz:13,method:[0,4,5,6,7,8,9,10,12,13,14],sipclass:10,pyexc_valueerror:10,set_build_macro:0,result:[10,6,8,4],respons:[5,13,9,10,4],fail:[10,4],subject:13,sip_tqunicodetranslateerror:12,hopefulli:13,simplest:13,sip_zerodivisionerror:12,clean_build_file_object:0,handwritten:[1,4,9,10,11,12,8],accord:[13,7,4],extend:[5,13,10],sip_overflowerror:12,extens:[0,1,3,4,5,13],lazi:[1,13,4],preprocessor:[0,13,9,10,4],rtti:[10,4],protect:[0,4,5,6,7,10,12,13],expos:14,howev:[2,8,10,11,12,13,14],against:[0,13,10],sipfindclass:[9,4],logic:10,fno:2,com:[5,2],create_wrapp:0,seqlen:4,getwrit:14,setapi:[13,14],guid:[5,1],assum:[0,13,2,8,4],three:[0,13],been:[0,2,4,8,9,10,11,12,13,14],much:13,siptypeismap:4,interest:13,q_signal:12,"__len__":[12,8],sipconvertfrominst:[9,4],life:13,suppress:[8,4],argument:[0,1,4,5,6,7,9,10,12,13,8],child:13,"catch":[10,6],riverbankcomput:[5,2],wobj:10,qtcoremod:[13,10],ident:10,visitproc:10,properti:0,weren:9,"__ge__":12,have:[0,2,4,5,7,8,9,10,11,12,13,14],sip_slot_con:12,tabl:4,toolkit:5,sever:[5,4],sipselfwasarg:10,docvalu:8,receiv:12,suggest:13,make:[0,2,4,5,6,7,9,10,12,13,8],export_al:0,bigetbuffercod:[12,10],complex:[1,13],split:[13,6],sipgetsend:9,complet:[10,6,14],sip_api_major_nr:4,"__idiv__":12,rais:[0,13,10,14,4],ownership:[1,4,5,10,13,8],qaccel:12,tune:[0,13,2],redefin:[0,10,6,4],kept:[8,4],siptypeisclass:4,inherit:13,sip_importerror:12,thi:[0,2,4,5,6,7,8,9,10,12,13,14],endif:[13,10],programm:[12,10],everyth:13,left:[0,10,8],sip_keyboardinterrupt:12,protocol:[8,14,4],just:[0,3,4,9,10,13],gctraversecod:[12,10],previous:[9,4],easi:0,had:[5,9],sip_eoferror:12,qtguimod:[13,10],siptypeaspytypeobject:4,els:[13,10],save:4,opt:3,applic:[1,2,4,5,7,10,11,13,14],wai:[13,7,10,4],specif:[0,1,2,4,5,6,9,10,12,13,8],arbitrari:10,"__long__":12,sip_syntaxerror:12,cxxflag:2,underli:[12,8],www:[5,2],pymem_malloc:4,old:[13,9],deal:[12,13,10],sip_indentationerror:12,intern:[12,10,14],indirect:10,successfulli:[10,8],"__iand__":12,sipissubclassinst:9,buffer:[1,4,14,10,13,8],simplewrapp:[13,10,4],foo:[13,10,8],dd_next:8,"__ne__":12,sensibl:10,repositori:5,sipenum_:4,"super":[0,4,8,10,12,13,14],customw:7,pyarg_parsetupl:[12,10,4],py_modulegetdict:10,obj:[9,10,14,4],chronolog:0,"__mul__":12,produc:5,ppc:2,py_decref:10,regist:[13,4],"__dtor__":5,encod:[0,10,8,4],bound:[10,8,4],down:0,right:[0,10,11],"__and__":12,sipcanconverttoenum:4,often:[13,10,11],accordingli:13,suffici:3,segment:[13,10],support:[0,1,2,3,4,5,6,8,9,10,12,13,14],why:[13,10],avail:[2,3,4,5,9,10,12,13],reli:9,extra_cxxflag:0,siptransf:9,siptype_qpoint:10,gil:[10,6,8,13,4],qtcore:[0,10],"__isub__":12,form:[0,6,2,13],forc:8,heap:[13,10,14,4],"true":[12,1,14,8],arrays:8,sipgetpyobject:4,tell:13,sip_except:[12,10],minor:4,hierachi:13,sip_tqunicodeerror:12,emit:[12,8,4],featur:[0,1,5,6,9,10,12,13,8],initialisationcod:[12,13,10],classic:[12,1],sipforceconverttoinst:[9,4],"abstract":[5,10,8],exist:[0,2,4,6,10,14],trip:12,bmake:0,py_lib_dir:0,when:[0,1,2,4,5,6,8,10,11,12,13,14],test:4,asstr:14,intend:[0,13,10,11],sipenum_klass_enum:4,sipsimplewrapp:[9,10,4],longer:[9,10],sip_pyslic:[12,8],ignor:[0,4,14,10,13,8],sipcppptr:10,time:[0,4,5,6,8,10,13,14],leftmargin:0,sip_attributeerror:12,concept:[5,13],skip:[13,10],global:[1,4,5,6,10,12,13,8],signific:[10,6,8],supplement:10,raisecod:[12,10],"__rshift__":12,depend:[0,2,4,9,10,8],unpack:2,decim:0,riverbank:10,cobject:14,sip_mod_dir:0,sourc:[0,5,6,2,10],string:[0,4,8,10,12,13,14],extra_lib_dir:0,convertfromtypecod:[9,10],"__bool__":12,word:[13,10,11,3,8],exact:[12,13,10,8],administr:2,level:10,did:[0,9],gui:[0,5,7],pylist_new:10,"0x0001":14,sipstringtypeclassmap:4,dir:[0,6,2],prevent:[13,7,10,8,4],core:3,sipvoidptr_typ:4,sign:12,minimis:5,port:2,appear:[10,8],gcclearcod:[12,10],current:[0,13,10,8,4],qscintilla:6,sipdelayeddtor:8,iarr:[12,10],deriv:[0,1,4,7,10,11,12,13,8],gener:[0,1,2,4,5,6,8,9,10,11,12,13,14],explicitli:[2,5,8,9,10,12,13,14],address:[8,10,14,4],"__hex__":14,sip_runtimeerror:12,along:10,"__repr__":12,convertor:[9,4],extra:[0,13,6,8,4],modul:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14],prefer:10,pyobject_typecheck:4,sip_slot_di:12,instal:[0,1,2,5,7,13],sipregisterpytyp:[13,10,4],moduleheadercod:[12,10],memori:[4,5,14,10,13,8],univers:[0,2],visit:10,sipfindnamedenum:[9,4],siptypenam:4,msg:0,scope:[12,10,8,4],siptype_qtimerev:10,sip_pytupl:[12,10,8],scite:6,pyqwt:0,claus:[10,8],templat:[0,5,10,12,13],pyerr_except:10,uniqu:[10,4],descriptor:13,can:[0,2,3,4,5,6,7,8,9,10,11,12,13,14],purpos:[0,10,14,4],encapsul:[0,5],isdelet:14,occur:[0,10,8],alwai:[5,13,10,4],multipl:[10,2,8,13],"__license__":10,sipmalloc:[13,4],sip_protected_is_publ:[10,4],write:[0,4,5,7,10,13],pure:[0,2,5,10,13,8],sip_memoryerror:12,map:[1,4,5,10,12,13,8],"__next__":12,sipmodulemakefil:[0,13],mai:[0,2,4,5,6,8,7,10,12,13,14],underscor:[11,4],data:[5,12,10,11],practic:10,sipcallmethod:[9,10,4],sip_qobject:12,stdin:6,explicit:[12,10,8],inform:[0,5,6,10,12,13,14],"switch":10,preced:[0,8,11],combin:[0,10,4],callabl:[5,12,10],converttosubclasscod:[12,10,4],wrapinst:14,size_t:4,still:[13,9,10,7,8],pointer:[4,9,10,11,12,8],dynam:[13,7],entiti:10,conjunct:[10,8],disconnect:12,platform:[0,2,5,6,10,12,13],window:[0,2,5,6,7,13],main:[10,14],non:[0,4,7,10,13,8],"float":[12,8,4],siplenptr:10,contriv:10,initi:[10,4],qcustomev:10,now:[13,9,10,7],nor:10,introduct:[5,1],pykd:0,term:[5,10],name:[0,1,2,3,4,5,6,8,9,10,11,12,13,14],realist:13,transferback:[13,9,14,8,4],revers:13,revert:9,separ:[0,4,10,12,13,8],sipsimplewrapper_typ:4,sip_pycal:[12,8],compil:[0,2,4,5,6,9,10,12,13],sip_vers:[0,14,4],sip_standarderror:12,replac:[0,2,4,10,11,13],individu:[0,10],continu:10,wrap:[0,4,5,6,8,10,11,12,13,14],sipconvertfromsliceobject:4,happen:13,py_ssize_t:4,shown:10,settracemask:14,sipforceconverttomappedtyp:[9,4],space:0,"0x0010":14,bespok:0,correct:[2,4,7,10,13,8],earlier:[1,9,4],migrat:13,"byte":[8,10,14,4],unpredict:8,care:[0,13],setdefault:13,sipconverttovoidptr:4,thing:[13,10,14],pyslice_getindicesex:4,first:[0,4,6,10,12,13,14],oper:[5,8,9,10,12,13,14],reimplement:[0,10,8,4],directli:[11,4],onc:[2,8,4],arrai:[4,14,10,12,13,8],pyimport_importmodul:11,dump_object:10,open:10,sip_configur:[0,13],size:[0,2,4,6,8,10,14],given:[6,10,2,13,4],silent:10,convent:10,sippi:10,caught:[10,8],convention:13,conveni:[10,4],editor:6,especi:5,copi:[0,4,8,7,10,12,13,14],specifi:[0,2,4,5,8,10,12,13,14],pyqt4:[13,10,8],enclos:[10,6,4],than:[0,2,4,8,7,10,13,14],virtualcatchercod:[12,10,4],wide:[1,13,4],py_vers:0,were:[0,9],posit:[0,8],pre:10,sai:13,ani:[0,2,3,4,5,6,7,9,10,12,13,8],properli:[5,12,13],techniqu:7,sipconvertfromsequenceindex:4,note:[4,7,10,11,12,13,8],take:[0,2,7,10,12,13,8],noth:[12,10],begin:[10,4],sure:[10,2,13,4],trace:[6,14],normal:[0,3,4,7,8,9,10,13,14],multipli:8,sipforceconverttotyp:4,pair:[0,8],homepag:5,later:[5,13,14,4],picklecod:[12,10],show:[10,2,8,11],"0x020303":0,"__irshift__":12,slot:[5,12,8],sipgetst:[10,4],onli:[0,4,5,10,12,13,8],slow:0,activ:12,state:[10,14,4],api_export_symbol:11,dict:[0,4],variou:[2,14,4],get:[0,2,4,10,11,13,8],cannon:0,soon:10,cannot:[12,10,8,11],requir:[0,2,4,5,8,7,10,13,14],mybool:8,borrow:4,pynam:[10,8],hellomodulemakefil:13,where:[0,4,5,10,12,13,14],pytyp:4,prehook:8,sipcpp:[12,10],concern:9,arg_nr:4,detect:[13,10,4],sippytyp:10,accesscod:[12,10],enumer:4,label:13,between:[4,5,10,11,12,13,8],"import":[0,3,4,5,6,7,10,11,12,13,14],across:13,sipwrappercheck:11,parent:13,style:[0,9],cycl:[13,4],setcod:[12,10],come:4,"0x0020":14,programmakefil:0,sipresolvetypedef:4,mani:[5,13,2,8],among:3,acceler:12,undocu:10,period:10,exploit:[5,13,10],colon:8,build_command:0,default_bin_dir:0,mark:14,siparg:10,derefer:10,thousand:13,ascobject:14,sip_indexerror:12,"__eq__":12,those:[0,13,10,8,4],"case":[0,8,10,11,12,13,14],defaultmetatyp:[12,13,10],py_typ:4,"__mod__":12,sip_arithmeticerror:12,cast:[12,9,10,14,4],invok:[0,5,10,3],invoc:8,sipreleasetyp:[10,8,4],margin:0,advantag:10,stdout:0,support_foo:10,them:[0,5,9,10,13],worri:5,myapi:13,ascii:[10,8,4],concatan:8,"__init__":[0,13,7,10,14],develop:[0,2,4,5,13,14],etc:10,same:[0,3,4,7,8,9,10,12,13,14],check:[0,2,4,10,11,14],ispyown:14,binari:[0,10,2,12],html:10,document:[5,10,6,13],metatyp:[13,10,14,8],nest:10,sipmethod:[10,4],footprint:13,appropri:[0,10,2,8,4],macro:[0,13,2,4],without:[0,4,5,10,12,13,8],sipmappedtyp:4,dereferenc:8,"__int__":[12,14],execut:[0,2,5,6,8,10,13,14],tip:6,rest:[10,4],releasegil:[10,6,8,13],siptransferobj:10,tobj:10,struct:[12,13,10],except:[0,1,2,4,5,6,8,10,11,12,13,14],littl:[12,13],real:[12,10],around:[0,4,8,9,10,12,14],read:[0,12,10,8],swig:5,world:13,part:[0,4,5,7,8,9,10,12,13,14],sip_ssize_t:[10,4],saniti:11,whitespac:[13,10],integ:[0,4,14,10,12,8],either:[0,2,3,4,8,10,13,14],output:10,manag:[1,10,8,13,4],wrappertyp:[13,10,14,4],pyconfig:0,ascend:4,slice:[12,4],definit:[1,4,5,10,12,8],siperrorfail:10,sip_assertionerror:12,exit:[0,8],notabl:6,freed:[13,4],mname:0,garbag:[13,10,8,4],cppptr:4,fulli:[0,4],immut:4,"throw":[12,10,8],comparison:[5,9],methodcod:[12,10,8,4],sip_stopiter:12,sipprotectvirt_foo:10,processor:10,slash:8,strip:0,pyobject_callobject:4,your:[0,1,2,3,5,7,9,13],macos_platform:10,generate_target_default:0,fast:5,mingw32:13,area:4,aren:13,hex:8,modulemakefil:[0,7],start:[0,4,5,8,10,13,14],compliant:4,interfac:[1,10,13],prot_is_publ:0,lot:0,timelin:[0,10,6,12,13],"__invert__":12,tupl:[0,12,10,8,4],py_end_allow_thread:[12,10],nmake:13,rightmargin:0,"default":[0,2,6,8,10,12,13,14],pylist_get_s:10,"__le__":12,embed:[1,10,11],deadlock:13,holdgil:[10,6,8,13],expect:[13,9,10,8,4],creat:[0,2,3,4,5,8,7,10,13,14],certain:[10,8,4],a0kei:10,file:[0,1,2,3,4,5,6,7,9,10,11,12,13,8],sip_taberror:12,again:[13,10,8],readi:0,q_object:13,reduct:6,tight:5,valid:[0,13,10,4],pathnam:0,you:[0,2,3,4,5,7,8,9,10,12,13,14],architectur:[0,2],noderiv:8,sequenc:[0,8,4],symbol:[0,10,9,2,4],docstr:[5,10,6,12,8],track:13,reduc:[13,2],directori:[0,2,3,5,6,7,10,13],descript:[0,10,6,12,4],stdexcept:10,py_initmodul:10,potenti:[1,9,10,13],cpp:[6,3,4],dst:0,represent:[0,10],all:[0,2,4,5,6,8,10,12,13,14],unencod:[10,8],capsul:14,sipconvertfrommappedtyp:[9,4],follow:[0,2,3,4,5,7,8,9,10,11,12,13,14],ptr:10,qt_4_2_0:13,"__cmp__":12,program:[0,13,14],sip_ioerror:12,sip_feature_:10,dd_isderiv:8,setdelet:14,introduc:[13,9],sipvisit:10,liter:13,far:9,util:[5,10],mechan:[5,13],fall:4,veri:[13,10],sipcppret:10,list:[0,2,3,5,6,10,12,13,8],posthook:8,siptypescop:4,adjust:0,hello_sip_flag:13,stderr:[0,10],small:[5,13],py_begin_allow_thread:[12,10],py_inc_dir:0,platform_lib:0,ten:13,interpretor:13,pyobject:[12,10,11,4],keeprefer:8,"__truediv__":[12,9],design:[5,8],pass:[0,4,6,7,9,10,11,13,8],what:[5,13,10],sub:[0,2,4,5,8,10,13,14],sipconverttoinst:[9,4],section:[9,10,8,4],abl:7,overload:[5,10],delet:[10,14],version:[0,1,2,3,4,5,6,8,9,10,12,13,14],"public":[0,4,6,10,12,13],hasn:[10,4],full:[0,2,4,5,6,10,12,13],themselv:10,sipfindmappedtyp:[9,4],sophist:5,behaviour:[13,9,10],sip_vmserror:12,modifi:[0,7],valu:[0,2,4,8,7,10,12,13,14],search:[10,6,13],helloconfig:13,"__xor__":12,prior:[9,10,4],amount:[10,8],via:[8,4],deprec:[4,5,8,9,10,14],inappropri:4,sipbadlengthforslic:4,select:13,hexadecim:[0,14,4],win32_platform:10,sip_sign:12,two:[0,2,9,10,12,13],taken:[0,10,4],sip_oserror:12,more:[0,1,2,4,6,10,13,8],desir:[10,8],sip_block_thread:[10,4],c_api:11,hundr:13,ital:10,flag:[0,5,10,13,4],bireleasebuffercod:[12,10],particular:[0,7,9,10,13,8],known:[14,4],destin:0,cach:4,none:[0,13,10,14,8],sipprotect_foo:10,remain:[12,10,4],pylist_check:10,v2_0:10,def:13,share:[5,4],accept:8,sipreleaseinst:[9,4],cours:11,newlin:0,rather:[0,4,8,7,10,13,14],anoth:[0,4,5,8,10,13,14],siperrorcontinu:10,divis:[12,1],sipinttypeclassmap:4,simpl:[0,1,3,5,12,13],referenc:[10,11,4],api_wrapper_check:11,sip_windowserror:12,compulsori:[10,8],sipconfig:[0,5,7,2,13],generate_target_instal:0,associ:[13,8,10,14,4],circumst:14,"short":[12,10,8,4],qtgui:[0,13,10],required_str:0,tqchildren:13,caus:[2,4,6,14,13,8],callback:5,help:[0,5,6,2],a_mod:10,i386:2,through:[0,10],hierarchi:[12,13,10,4],implicitli:[9,14,8],paramet:[0,8,6,14,4],typedef:[12,1,10,8,4],scon:0,might:[0,12,10,8,13],good:[10,2],"return":[0,4,8,10,11,13,14],timestamp:[10,8],exportedheadercod:[12,10],framework:0,somebodi:13,converttotypecod:[12,9,10,8,4],complain:8,"0x0008":14,easili:10,alreadi:[8,10,14,11,4],compris:5,found:[0,13,4],unicod:[13,10,8,4],"0x0004":14,inplac:[12,10],"0x0002":14,hard:13,idea:2,connect:[5,12,8],notypenam:8,event:10,setsiz:14,publish:13,print:10,occurr:10,siptype_klass:[10,4],qualifi:[10,4],sipwrapper_typ:4,reason:[13,10],base:[0,4,5,10,12,14],sbf:13,ask:10,earliest:[0,10],pylist_get_item:10,thread:[0,5,10,8,13],pycobject_check:11,omit:[12,10,6,8],perhap:7,lifetim:5,assign:[13,4],siptypeisnamespac:4,major:[2,4],default_mod_dir:[0,13],obviou:13,upper:[10,8,4],number:[0,1,2,4,5,6,8,10,12,13,14],extern:[5,10,8],done:[13,10],construct:[13,10],stabl:5,miss:9,build_ext:3,"__float__":12,gpl:[5,10],differ:[0,2,5,8,9,10,12,13,14],script:[0,2,3,5,7,10,13],interact:13,least:13,mfile:0,"__ixor__":12,store:10,option:[0,2,3,4,5,6,7,8,9,10,13,14],relationship:[13,4],siptransferbreak:[13,4],getter:[13,4],pars:[0,10,8],std:10,version_to_sip_tag:0,cyclic:[13,10,8,4],remov:[0,13,9,8,4],sip_api_minor_nr:4,str:8,consumpt:5,chkdir:0,comput:[10,8],create_config_modul:[0,13],tp_name:[8,4],packag:[0,10,7,2,8],"null":[10,11,4],sipkwd:10,"0x040000":[0,14,4],built:[0,5,7,10,2],lib:[13,2],self:[0,13,10],"__div__":[12,9],also:[0,2,4,5,6,7,10,11,13,8],build:[0,1,2,3,4,5,6,7,10,13],distribut:[5,7,2],exec:8,klassinst:10,previou:[13,8,10,14,4],defaultencod:[12,10,8],most:[12,10,6,14,4],maco:[0,5,2],addr:14,clear:10,cover:[5,10,2,13],transferobj:4,supertyp:[13,10,8],extra_lflag:0,latest:[0,5,10,2],microsoft:2,getcod:[12,10],particularli:14,sip_rxobj_con:[12,8],unitcod:[12,10],fine:[0,13,2],find:[5,13,8],copyright:[5,10],keyreleas:10,express:[0,12,10],py_non:[10,4],mappedtyp:[12,10],setdata:10,"_c_api":11,catcher:10,whenev:[13,9,10,8],common:[5,10,14],sip_unboundlocalerror:12,noreleas:8,set:[0,2,4,5,6,8,10,11,13,14],dump:14,mutabl:[14,4],extra_include_dir:0,sipr:10,arg:4,"__imod__":12,pythonw:7,call_exec:8,someth:[13,9,2],siptypeisenum:4,smallest:0,subdir:0,altern:[5,13,8],signatur:[4,5,6,9,10,12,8],latin:[10,8,4],numer:[0,8],disallow:[10,4],sipiserr:10,complementari:[5,9],popul:[13,10,4],both:[0,4,5,10,12,13,8],last:[12,13,10,8],license:[10,8],operat:12,context:[12,10,8,4],connectitem:12,load:[0,5,7,14],sipclass_klass:[10,4],simpli:[13,10],point:[4,14,10,12,13,8],instanti:[10,8],header:[0,2,5,10,11,13],linux:[5,6,7,2],throughout:10,compositemodul:[12,10],static_cast:10,empti:0,destructor:[4,5,8,10,12,13,14],extra_defin:0,strategi:13,sipconvertfromnamedenum:[9,4],convert:[0,2,4,6,10,11,13,8],sipreskei:10,understand:[5,12,14],"__lshift__":12,nodefaultctor:8,look:[6,7,2,8,13],sipreleasemappedtyp:[9,4],abov:[0,8,3],error:[0,10,8,4],"__hash__":12,anonym:4,sip_pylist:[12,8],sip_slot:12,readm:2,itself:[4,5,7,10,12,13],pytypeobject:[10,4],pyqt_sip_flag:13,sipmapstringtoclass:4,conflict:[13,6],behav:13,sym:4,temporari:[10,8,4],user:[9,7,4],"__add__":[12,10],wherev:10,chang:[0,4,5,9,10,13,8],travers:10,task:13,equival:[0,12,10,14,8],entri:[8,4],parenthes:4,pickl:10,sipflag:10,"__neg__":12,sip_rxobj_di:12,explan:10,getapi:14,dump_klass:10,siperrornon:10,restructuredtext:10,appli:[13,9,10,8,4],subsequ:[5,13,10,4],sip_pytyp:[12,8],format:[0,2,4,9,10,8],"__gt__":12,bit:14,pystring_fromstringands:10,formal:12,semi:12,signal:[5,12,8,4],resolv:0,collect:[12,13,10,8,4],api:[0,1,4,5,6,7,8,9,10,11,12,13,14],maplen:4,version_to_str:0,nbyte:4,sip_floatingpointerror:12,creation:5,some:[4,5,6,8,7,10,12,13,14],back:[0,8],siptype_qwidget:10,transferthi:[13,8],pep:4,larg:[5,13,10],recognis:10,pystring_asstringands:10,run:[5,10,2,3,13],siptransferto:[13,14,4],reach:13,step:[2,4],impos:10,sipconverttomappedtyp:[9,4],idx:4,block:[5,6,14,10,13,8],primarili:8,within:[10,8,4],ellipsi:8,hex_:8,ensur:[0,4,5,10,13,8],next:[10,7,2,8,13],question:13,"long":[12,6,8,4],custom:[0,1,7,2],handler:[13,4],sipseg:10,suit:0,forward:8,doctyp:8,sipmoduledict:10,siptype_qkeyev:10,link:[0,13,7,10,8],translat:10,line:[0,1,2,3,6,7,8,9,10,12,13,14],sdk:[0,2],getwrapp:[10,8],concaten:10,utf:[10,8,4],consist:12,bigetcharbuffercod:[12,10],py_buildvalu:[10,4],similar:[5,13,8,4],install_fil:0,sipconvertfromconstvoidptr:4,newthread:8,dd_list:8,sip_tqunicodeencodeerror:12,parser:[12,13,8],doesn:[0,12,10,13,4],repres:[0,4,14,12,13,8],"char":[12,13,10,8,4],sipdir:2,sipmodul:10,invalid:0,keywordarg:8,bracket:[10,4],librari:[0,2,5,6,7,10,12,13,14],clean:0,eval:4,unaffect:4,an_object_refer:9,leak:[13,10,8,4],hello:13,sip_referenceerror:12,install_dir:0,code:[0,1,2,4,5,6,8,9,10,11,12,13,14],sipconvertfromenum:4,results:8,qtguimodulemakefil:13,the_word:13,privat:[5,12,8,13],sens:12,generate_target_clean:0,sip_valueerror:12,sip_no_convertor:[10,4],typeheadercod:[12,13,10],sipconnectrx:9,siperrorfail1:10,relev:5,tri:[10,8],sipbuildresult:[9,4],"try":[10,6,14,13],refer:[0,1,4,5,8,10,11,13,14],sub_cfg:[0,13],sipdistutil:[5,3],impli:[0,8],smaller:13,cfg:[13,3],contructor:10,download:[5,1,2],append:[0,10,2,13],compat:[0,10,2,8,4],index:4,defaultsupertyp:[12,13,10],access:[0,4,5,6,10,12,13],sipexception_:4,consolid:[5,10],parse_build_macro:0,len:4,bodi:10,let:13,becom:[11,4],great:5,convers:[4,5,9,10,12,8],broken:4,pycobject_asvoidptr:11,typic:[0,13,9,10],chanc:13,siptype_typ:10,sip_not_non:[10,4],"boolean":[12,8,4],sipptrptr:10,sipexception_klass_except:4,from:[0,2,3,4,5,6,7,9,10,11,12,13,8],zip:2,doubl:[12,8,4],qobject:[12,13,10],implic:13,few:12,sip_unblock_thread:[10,4],sort:[13,6,4],rich:5,src:0,greatli:10,augment:0,annot:[1,4,6,9,10,12,13,8],bigetwritebuffercod:[12,10],obvious:13,thin:[12,4],proprietari:7,control:[13,10,4],sipgetwrapp:[9,4],tar:2,process:[5,10,3],lock:[1,4,5,6,10,13,8],tag:[0,13,6],fprintf:10,msvc:0,delai:8,gcc:2,sip:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14],sit:0,pyqt:[0,5,9,10,13],"__pos__":12,instead:[12,13,10,8,4],preinitialisationcod:[12,10],overridden:10,pymodule_getdict:11,alloc:[13,4],bind:[0,2,5,6,13,14],correspond:[0,2,4,5,10,11,12,13,8],element:[0,12,10,8,4],issu:[5,13,8],siperrorst:[10,4],allow:[0,2,4,5,7,9,10,12,13,8],siptypefrompytypeobject:4,typecod:[12,10],siptransferback:[13,14,4],comma:[12,13,8],py_conf_inc_dir:0,sipconvertfromnewinst:[9,4],destroi:[13,10,8,4],srcdir:0,therefor:[5,13],sipfre:[13,4],crash:[13,14],greater:[0,8,10,14,4],"__getitem__":[12,8],python:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14],auto:6,generate_macros_and_rul:0,nokia:5,qmake:0,"__delitem__":[12,8],postinitialisationcod:[12,10],anyth:8,modulecod:[12,10,8],subset:12,meta:[1,4,5,10,13,8],"static":[0,2,4,5,7,10,12,13],sipklass:[12,4],our:[13,3],special:[12,9,3],out:[5,13,2,8,4],variabl:[1,5,10,12,13,8],influenc:4,stub:[7,10],suitabl:5,rel:0,leverag:3,vendorid:7,q_slot:12,standalon:10,qtmod:10,dictionari:[0,4,10,11,12,13],releas:[2,4,5,6,10,13,8],afterward:[10,6,8],unnam:[10,14,8],opengl:0,timer:10,keep:[13,10],sipconvertfromnewtyp:4,length:[5,10,4],outsid:12,optional_list:0,softwar:[5,2],suffix:6,date:[13,2],owner:[14,4],parse_build_fil:0,facil:[0,6],typestr:4,transferto:14,dd_ptr:8,unknown:[14,8],licens:[5,1,10,12,8],sipparseresult:[9,10,4],system:[0,1,2,3,4,5,6,7,13],wrapper:[0,4,5,6,8,10,12,13,14],attach:10,termin:[13,10,8,4],"final":[10,2,13],sipclass_:4,"__del__":14,sip_systemexit:12,exactli:10,cmodul:[12,13,10],qevent:10,bother:13,see:[0,2,3,4,5,6,10,11,12,13,8],structur:[1,4,5,6,8,9,10,11,13,14],charact:[0,1,4,9,10,12,13,8],nocopi:8,slicelength:4,sipapidef:11,linker:[0,5,13],clearli:10,clib:0,sip_inc_dir:0,pyqt_sip_dir:13,need:[0,2,3,4,5,6,7,9,10,11,12,13,8],turn:10,tidi:10,verbatim:13,sip_typeerror:12,"0x04":4,"0x01":4,"0x02":4,builtin:[0,1,2,8,7,14],"_qt":10,which:[0,2,3,4,5,6,7,8,9,10,12,13,14],singl:[0,5,10,12,13],regard:[13,10,8,4],unless:[10,8],clash:[10,8],deploy:[13,10],pyd:5,"class":[0,1,4,5,6,8,7,10,12,13,14],siptype_:4,request:4,snapshot:[0,14,4],determin:[13,8,10,14,4],siptyp:10,constrain:[9,8],keypress:10,fact:5,extra_lib:[0,13],a0wrapp:10,text:[0,13,10],bring:5,sip_tqunicodedecodeerror:12,dbu:10,anywai:[10,8],locat:[13,4],sip_config_arg:0,should:[0,2,4,7,9,10,12,13,8],local:[10,3],hope:13,meant:[9,8],memcpi:10,increas:0,extract:[0,5,10],enabl:[0,4,6,8,10,13,14],sipconverttotyp:[10,4],possibl:[5,12,10,14,8],integr:[5,8],contain:[0,4,5,6,7,10,11,12,13,8],pylong_asunsignedlong:4,attribut:[0,1,13,11,4],sipexportsymbol:[11,4],sipwrappertype_typ:4,pyobject_print:10,correctli:[12,13],pattern:[0,10],dll:13,written:[0,5],neither:13,kei:[0,13,10],"__ifloordiv__":12,job:10,strdefin:0,"__ilshift__":12,addit:[0,1,4,9,10,12,13,8],consolidatedmodul:[12,10,6],use_arch:0,equal:[13,8,10,14,4],"__ior__":12,instanc:[0,4,5,8,10,11,12,13,14],comment:7,hyphen:8,py_xdecref:10,respect:[13,4],siplong_asunsignedlong:4,compon:[5,1,6,2,10],treat:[14,8],immedi:[10,8],"__itruediv__":12,ob_typ:4,togeth:5,sipbuff:10,dstdir:0,"__iadd__":12,defin:[0,2,4,5,8,9,10,11,12,13,14],typeint:4,"__floordiv__":12,"__sub__":12,noargpars:[10,8],helper:[10,4],reacquir:[10,6,8],sip_version_str:[0,14,4],sipattrgetterfunc:4,sip_temporari:[10,8],unneed:[0,10],member:[12,9,10,8,11],handl:[0,8,7,10,13,14],sip_environmenterror:12,http:[5,2],sipmapinttoclass:4,effect:[12,13,10],dealloc:10,distutil:[0,1,13,3,5],sipisapien:4,firstli:13,whole:13,ext_modul:3,exampl:[0,1,2,3,4,7,10,11,12,13,8],command:[0,1,2,3,6,7,8,9,10,13,14],choos:[5,10,8],undefin:10,usual:[0,10,8,3,4],unari:12,less:[13,10,8,4],obtain:[8,11,4],optional_str:0,"__lt__":12,prepend:10,field:8,makefil:[0,13,7,6],sip_anyslot:12,add:[13,10],ws_win:13,match:[5,12,10,8,13],sip_bin:[0,13],piec:10,siptypedef:[10,4],know:[12,10],recurs:10,insert:0,pyerr_occur:4,like:[2,4,7,9,10,13,8],success:4,build_macro:0,necessari:[0,5,9,10,11,12,13],suppli:[13,8,4],destdir:2,"export":[0,10,11,4],sippyself:10,win32:2,borland:2,"__contains__":12,qlist:10,avoid:[0,10,6,8,13],numdefin:0,overlap:8,leav:13,hello_sip_dir:13,sipconvertfromconstvoidptrands:4,"enum":[1,4,9,10,11,12,8],although:2,offset:4,stage:7,about:[5,6,14,8],actual:[13,10,8,11],"__imul__":[12,10],sipconverttocpp:9,statement:[12,10,6,14],includ:[0,2,4,5,6,8,10,11,12,13,14],constructor:[0,4,6,8,10,12,13,14],fals:12,discard:8,disabl:[0,6,10,2,14],own:[0,5,8,7,10,13,14],sipwrapper_check:[9,4],automat:[0,4,5,6,8,9,10,13,14],pyqtwrappertyp:10,"__abs__":12,merg:[13,10],transfer:[13,9,10,8,4],sip_notimplementederror:12,sipconvertfromvoidptr:4,sip_modul:11,"function":[0,1,4,5,6,8,9,10,11,12,13,14],unexpect:4,sip_systemerror:12,neutral:0,sipfindtyp:[11,4],bug:4,count:[13,10,4],made:[13,10,8,4],parentmakefil:0,whether:10,wish:2,writeabl:[14,4],displai:[0,6,2,14],limit:[13,10],otherwis:[10,2,8,4],problem:[0,13,8],"int":[12,9,10,8,4],mask:14,dure:[0,5,10,6],sipbadcatcherresult:4,filenam:[0,10],posix_platform:10,implement:[0,4,5,6,8,9,10,12,13,14],sipexception_std_except:10,mutual:[13,10],sip_pyobject:[12,8],detail:[0,2,4,5,10,12,13,8],virtual:[4,5,8,10,12,13,14],other:[0,2,4,5,10,12,13,8],bool:[12,8,10,14,4],futur:14,rememb:10,unwrapinst:14,repeat:8,pyerr_setnon:10,exporteddoc:[12,10,6],singleton:8,optionalinclud:[12,10],rule:0,klass:[12,10,4],"__index__":12,sipclassnam:[9,4]},titles:["The Build System","SIP Reference Guide","Installation","Building Your Extension with distutils","C API for Handwritten Code","Introduction","The SIP Command Line","Builtin Modules and Custom Interpreters","Annotations","Potential Incompatibilities with Earlier Versions","Directives","Using the C API when Embedding","SIP Specification Files","Using SIP","Python API for Applications"],modules:{sipconfig:0,sip:14},descrefs:{"":{sipGetState:[4,0],sipTransferTo:[4,0],SIP_VERSION:[4,3],sipSimpleWrapper:[4,5],sipFindMappedType:[4,0],SIP_API_MAJOR_NR:[4,3],sipLong_AsUnsignedLong:[4,0],sipConvertFromEnum:[4,0],sipIntTypeClassMap:[4,5],dd_name:[8,6],sipConvertFromInstance:[4,0],sipReleaseType:[4,0],SIP_NO_CONVERTORS:[4,3],sipTypeName:[4,0],sipConvertToInstance:[4,0],sipMapIntToClass:[4,0],sipFindType:[4,0],sipConvertFromType:[4,0],sipTypeIsEnum:[4,0],sipSimpleWrapper_Type:[4,8],sipConvertFromSliceObject:[4,0],sipForceConvertToMappedType:[4,0],sipTypeIsNamespace:[4,0],sipConvertToVoidPtr:[4,0],sipCanConvertToType:[4,0],sipCanConvertToInstance:[4,0],sipConvertFromConstVoidPtrAndSize:[4,0],typeString:[4,6],sipForceConvertToType:[4,0],dd_next:[8,6],sipExportSymbol:[4,0],sipBadLengthForSlice:[4,0],sipConvertToMappedType:[4,0],sipTypeAsPyTypeObject:[4,0],sipIsAPIEnabled:[4,0],sipTypeFromPyTypeObject:[4,0],sipForceConvertToInstance:[4,0],sipConvertFromVoidPtrAndSize:[4,0],sipReleaseMappedType:[4,0],sipStringTypeClassMap:[4,5],SIP_API_MINOR_NR:[4,3],sipVoidPtr_Type:[4,8],sipFree:[4,0],sipRegisterAttributeGetter:[4,0],sipConvertToType:[4,0],sipWrapperType:[4,5],sipConvertFromNewType:[4,0],SIP_PROTECTED_IS_PUBLIC:[4,3],dd_ptr:[8,6],sipConvertFromSequenceIndex:[4,0],SIP_VERSION_STR:[4,3],sipTypeIsMapped:[4,0],SIP_NOT_NONE:[4,3],sipClassName:[4,0],sipMapStringToClass:[4,0],sipWrapperType_Type:[4,8],sipConvertFromNewInstance:[4,0],sipTransferBack:[4,0],sipMalloc:[4,0],sipConvertFromMappedType:[4,0],sipWrapper:[4,5],dd_isderived:[8,6],sipConvertFromConstVoidPtr:[4,0],sipTypeIsClass:[4,0],sipBadCatcherResult:[4,0],sipGetPyObject:[4,0],SIP_UNBLOCK_THREADS:[4,3],sipDelayedDtor:[8,5],sipReleaseInstance:[4,0],sipWrapper_Check:[4,0],sipTransferBreak:[4,0],typeInt:[4,6],sipTypeScope:[4,0],sipImportSymbol:[4,0],sipDelayedDtors:[8,0],sipFindClass:[4,0],sipResolveTypedef:[4,0],sipConvertFromNamedEnum:[4,0],SIP_BLOCK_THREADS:[4,3],sipGetWrapper:[4,0],sipBadCallableArg:[4,0],sipFindNamedEnum:[4,0],user:[4,6],sipCanConvertToEnum:[4,0],sipCanConvertToMappedType:[4,0],sipWrapper_Type:[4,8],sipCallMethod:[4,0],sipParseResult:[4,0],sipBuildResult:[4,0],sipRegisterPyType:[4,0],SIP_SSIZE_T:[4,3],sipConvertFromVoidPtr:[4,0]},"sipconfig.PythonModuleMakefile":{generate_target_install:[0,1],generate_macros_and_rules:[0,1],"__init__":[0,1]},sip:{transferto:[14,2],getapi:[14,2],settracemask:[14,2],setdeleted:[14,2],dump:[14,2],transferback:[14,2],SIP_VERSION_STR:[14,9],ispyowned:[14,2],wrapper:[14,7],cast:[14,2],unwrapinstance:[14,2],setapi:[14,2],wrapinstance:[14,2],SIP_VERSION:[14,9],voidptr:[14,7],wrappertype:[14,7],isdeleted:[14,2],"delete":[14,2]},"sip.voidptr":{"__int__":[14,1],getwriteable:[14,1],setwriteable:[14,1],ascobject:[14,1],ascapsule:[14,1],getsize:[14,1],"__hex__":[14,1],asstring:[14,1],setsize:[14,1],"__init__":[14,1]},"sipconfig.ProgramMakefile":{generate_target_default:[0,1],build_command:[0,1],generate_macros_and_rules:[0,1],generate_target_clean:[0,1],generate_target_install:[0,1],finalise:[0,1],"__init__":[0,1]},"sipconfig.ParentMakefile":{generate_target_clean:[0,1],generate_target_install:[0,1],generate_target_default:[0,1],generate_macros_and_rules:[0,1],"__init__":[0,1]},sipconfig:{create_config_module:[0,2],ModuleMakefile:[0,7],Configuration:[0,7],create_wrapper:[0,2],version_to_sip_tag:[0,2],format:[0,2],parse_build_macros:[0,2],create_content:[0,2],ParentMakefile:[0,7],Makefile:[0,7],read_version:[0,2],inform:[0,2],error:[0,2],version_to_string:[0,2],ProgramMakefile:[0,7],SIPModuleMakefile:[0,7],PythonModuleMakefile:[0,7]},"sipconfig.ModuleMakefile":{generate_target_default:[0,1],generate_macros_and_rules:[0,1],generate_target_clean:[0,1],module_as_lib:[0,1],generate_target_install:[0,1],finalise:[0,1],"__init__":[0,1]},"sipconfig.Makefile":{chkdir:[0,4],platform_lib:[0,1],install_file:[0,1],ready:[0,1],extra_libs:[0,4],"__init__":[0,1],generate_target_default:[0,1],console:[0,4],generator:[0,4],extra_include_dirs:[0,4],clean_build_file_objects:[0,1],mkdir:[0,4],extra_cflags:[0,4],rm:[0,4],extra_lib_dirs:[0,4],config:[0,4],finalise:[0,1],required_string:[0,1],extra_cxxflags:[0,4],extra_lflags:[0,4],parse_build_file:[0,1],generate_target_clean:[0,1],copy:[0,4],generate_target_install:[0,1],generate:[0,1],optional_string:[0,1],optional_list:[0,1],generate_macros_and_rules:[0,1],extra_defines:[0,4]},"sipconfig.SIPModuleMakefile":{finalise:[0,1],"__init__":[0,1]},"sipconfig.Configuration":{set_build_macros:[0,1],default_mod_dir:[0,4],default_bin_dir:[0,4],platform:[0,4],universal:[0,4],sip_version:[0,4],sip_config_args:[0,4],default_sip_dir:[0,4],sip_mod_dir:[0,4],build_macros:[0,1],py_inc_dir:[0,4],sip_inc_dir:[0,4],py_conf_inc_dir:[0,4],py_version:[0,4],py_lib_dir:[0,4],arch:[0,4],sip_version_str:[0,4],"__init__":[0,1],sip_bin:[0,4]}},filenames:["build_system","index","installation","distutils","c_api","introduction","command_line","builtin","annotations","incompatibilities","directives","embedding","specification_files","using","python_api"]})
\ No newline at end of file diff --git a/doc/html/specification_files.html b/doc/html/specification_files.html index e408fe4..8810aa2 100644 --- a/doc/html/specification_files.html +++ b/doc/html/specification_files.html @@ -171,15 +171,15 @@ file.</p> <em>virtual-operator</em> | <em>class-variable</em> | <strong>public:</strong> | - <strong>public Q_SLOTS:</strong> | + <strong>public slots:</strong> | <strong>public slots:</strong> | <strong>protected:</strong> | - <strong>protected Q_SLOTS:</strong> | + <strong>protected slots:</strong> | <strong>protected slots:</strong> | <strong>private:</strong> | - <strong>private Q_SLOTS:</strong> | <strong>private slots:</strong> | - <strong>Q_SIGNALS:</strong> | + <strong>private slots:</strong> | + <strong>signals:</strong> | <strong>signals:</strong>] <em>constructor</em> ::= [<strong>explicit</strong>] <em>name</em> <strong>(</strong> [<em>argument-list</em>] <strong>)</strong> @@ -193,7 +193,7 @@ file.</p> [<em>function-annotations</em>] <strong>;</strong> [<a class="reference external" href="directives.html#directive-%MethodCode"><tt class="xref docutils literal"><span class="pre">%MethodCode</span></tt></a>] [<a class="reference external" href="directives.html#directive-%VirtualCatcherCode"><tt class="xref docutils literal"><span class="pre">%VirtualCatcherCode</span></tt></a>] -<em>method</em> ::= [<strong>Q_SIGNAL</strong>] [<strong>Q_SLOT</strong>] <em>type</em> <em>name</em> <strong>(</strong> +<em>method</em> ::= [<strong>TQ_SIGNAL</strong>] [<strong>TQ_SLOT</strong>] <em>type</em> <em>name</em> <strong>(</strong> [<em>argument-list</em>] <strong>)</strong> [<strong>const</strong>] [<em>exceptions</em>] [<strong>= 0</strong>] [<em>function-annotations</em>] [<em>c++-signature</em>] <strong>;</strong> [<a class="reference external" href="directives.html#directive-%Docstring"><tt class="xref docutils literal"><span class="pre">%Docstring</span></tt></a>] [<a class="reference external" href="directives.html#directive-%MethodCode"><tt class="xref docutils literal"><span class="pre">%MethodCode</span></tt></a>] @@ -202,7 +202,7 @@ file.</p> <em>static-method</em> ::= <strong>static</strong> <em>function</em> -<em>virtual-method</em> ::= [<strong>Q_SIGNAL</strong>] [<strong>Q_SLOT</strong>] <strong>virtual</strong> <em>type</em> <em>name</em> +<em>virtual-method</em> ::= [<strong>TQ_SIGNAL</strong>] [<strong>TQ_SLOT</strong>] <strong>virtual</strong> <em>type</em> <em>name</em> <strong>(</strong> [<em>argument-list</em>] <strong>)</strong> [<strong>const</strong>] [<em>exceptions</em>] [<strong>= 0</strong>] [<em>function-annotations</em>] [<em>c++-signature</em>] <strong>;</strong> [<a class="reference external" href="directives.html#directive-%MethodCode"><tt class="xref docutils literal"><span class="pre">%MethodCode</span></tt></a>] [<a class="reference external" href="directives.html#directive-%VirtualCatcherCode"><tt class="xref docutils literal"><span class="pre">%VirtualCatcherCode</span></tt></a>] @@ -310,7 +310,7 @@ file.</p> <em>argument</em> ::= [ <em>type</em> [<em>name</em>] [<em>argument-annotations</em>] [<em>default-value</em>] | <a class="reference internal" href="#stype-SIP_ANYSLOT"><tt class="xref docutils literal"><span class="pre">SIP_ANYSLOT</span></tt></a> [<em>default-value</em>] | - <a class="reference internal" href="#stype-SIP_QOBJECT"><tt class="xref docutils literal"><span class="pre">SIP_QOBJECT</span></tt></a> | + <a class="reference internal" href="#stype-SIP_TQOBJECT"><tt class="xref docutils literal"><span class="pre">SIP_TQOBJECT</span></tt></a> | <a class="reference internal" href="#stype-SIP_RXOBJ_CON"><tt class="xref docutils literal"><span class="pre">SIP_RXOBJ_CON</span></tt></a> | <a class="reference internal" href="#stype-SIP_RXOBJ_DIS"><tt class="xref docutils literal"><span class="pre">SIP_RXOBJ_DIS</span></tt></a> | <a class="reference internal" href="#stype-SIP_SIGNAL"><tt class="xref docutils literal"><span class="pre">SIP_SIGNAL</span></tt></a> [<em>default-value</em>] | @@ -467,28 +467,28 @@ Handwritten code must be provided to interpret the conversion correctly.</p> <p>This is a <tt class="docutils literal"><span class="pre">PyObject</span> <span class="pre">*</span></tt> that is a Python type object.</p> <dl class="sip-type"> -<dt id="stype-SIP_QOBJECT"> -<tt class="descname">SIP_QOBJECT</tt><a class="headerlink" href="#stype-SIP_QOBJECT" title="Permalink to this definition">¶</a></dt> +<dt id="stype-SIP_TQOBJECT"> +<tt class="descname">SIP_TQOBJECT</tt><a class="headerlink" href="#stype-SIP_TQOBJECT" title="Permalink to this definition">¶</a></dt> <dd></dd></dl> -<p>This is a <tt class="docutils literal"><span class="pre">QObject</span> <span class="pre">*</span></tt> that is a C++ instance of a class derived from Qt’s -<tt class="docutils literal"><span class="pre">QObject</span></tt> class.</p> +<p>This is a <tt class="docutils literal"><span class="pre">TQObject</span> <span class="pre">*</span></tt> that is a C++ instance of a class derived from TQt’s +<tt class="docutils literal"><span class="pre">TQObject</span></tt> class.</p> <dl class="sip-type"> <dt id="stype-SIP_RXOBJ_CON"> <tt class="descname">SIP_RXOBJ_CON</tt><a class="headerlink" href="#stype-SIP_RXOBJ_CON" title="Permalink to this definition">¶</a></dt> <dd></dd></dl> -<p>This is a <tt class="docutils literal"><span class="pre">QObject</span> <span class="pre">*</span></tt> that is a C++ instance of a class derived from Qt’s -<tt class="docutils literal"><span class="pre">QObject</span></tt> class. It is used as the type of the receiver instead of <tt class="docutils literal"><span class="pre">const</span> -<span class="pre">QObject</span> <span class="pre">*</span></tt> in functions that implement a connection to a slot.</p> +<p>This is a <tt class="docutils literal"><span class="pre">TQObject</span> <span class="pre">*</span></tt> that is a C++ instance of a class derived from TQt’s +<tt class="docutils literal"><span class="pre">TQObject</span></tt> class. It is used as the type of the receiver instead of <tt class="docutils literal"><span class="pre">const</span> +<span class="pre">TQObject</span> <span class="pre">*</span></tt> in functions that implement a connection to a slot.</p> <dl class="sip-type"> <dt id="stype-SIP_RXOBJ_DIS"> <tt class="descname">SIP_RXOBJ_DIS</tt><a class="headerlink" href="#stype-SIP_RXOBJ_DIS" title="Permalink to this definition">¶</a></dt> <dd></dd></dl> -<p>This is a <tt class="docutils literal"><span class="pre">QObject</span> <span class="pre">*</span></tt> that is a C++ instance of a class derived from Qt’s -<tt class="docutils literal"><span class="pre">QObject</span></tt> class. It is used as the type of the receiver instead of <tt class="docutils literal"><span class="pre">const</span> -<span class="pre">QObject</span> <span class="pre">*</span></tt> in functions that implement a disconnection from a slot.</p> +<p>This is a <tt class="docutils literal"><span class="pre">TQObject</span> <span class="pre">*</span></tt> that is a C++ instance of a class derived from TQt’s +<tt class="docutils literal"><span class="pre">TQObject</span></tt> class. It is used as the type of the receiver instead of <tt class="docutils literal"><span class="pre">const</span> +<span class="pre">TQObject</span> <span class="pre">*</span></tt> in functions that implement a disconnection from a slot.</p> <dl class="sip-type"> <dt id="stype-SIP_SIGNAL"> <tt class="descname">SIP_SIGNAL</tt><a class="headerlink" href="#stype-SIP_SIGNAL" title="Permalink to this definition">¶</a></dt> @@ -514,11 +514,11 @@ of an explicitly generated signal to a slot.</p> <tt class="docutils literal"><span class="pre">const</span> <span class="pre">char</span> <span class="pre">*</span></tt> in functions that implement the connection of an internally generated signal to a slot. The type includes a comma separated list of types that is the C++ signature of of the signal.</p> -<p>To take an example, <tt class="docutils literal"><span class="pre">QAccel::connectItem()</span></tt> connects an internally generated +<p>To take an example, <tt class="docutils literal"><span class="pre">TQAccel::connectItem()</span></tt> connects an internally generated signal to a slot. The signal is emitted when the keyboard accelerator is activated and it has a single integer argument that is the ID of the accelerator. The C++ signature is:</p> -<div class="highlight-python"><pre>bool connectItem(int id, const QObject *receiver, const char *member);</pre> +<div class="highlight-python"><pre>bool connectItem(int id, const TQObject *receiver, const char *member);</pre> </div> <p>The corresponding SIP specification is:</p> <div class="highlight-python"><pre>bool connectItem(int, SIP_RXOBJ_CON, SIP_SLOT_CON(int));</pre> diff --git a/doc/html/using.html b/doc/html/using.html index 5ff6786..c3c0309 100644 --- a/doc/html/using.html +++ b/doc/html/using.html @@ -235,13 +235,13 @@ be used for this example without change.</p> <div class="section" id="a-more-complex-c-example"> <h2>A More Complex C++ Example<a class="headerlink" href="#a-more-complex-c-example" title="Permalink to this headline">¶</a></h2> <p>In this last example we will wrap a fictional C++ library that contains a class -that is derived from a Qt class. This will demonstrate how SIP allows a class +that is derived from a TQt class. This will demonstrate how SIP allows a class hierarchy to be split across multiple Python extension modules, and will introduce SIP’s versioning system.</p> <p>The library contains a single C++ class called <tt class="docutils literal"><span class="pre">Hello</span></tt> which is derived from -Qt’s <tt class="docutils literal"><span class="pre">QLabel</span></tt> class. It behaves just like <tt class="docutils literal"><span class="pre">QLabel</span></tt> except that the text +TQt’s <tt class="docutils literal"><span class="pre">TQLabel</span></tt> class. It behaves just like <tt class="docutils literal"><span class="pre">TQLabel</span></tt> except that the text in the label is hard coded to be <tt class="docutils literal"><span class="pre">Hello</span> <span class="pre">World</span></tt>. To make the example more -interesting we’ll also say that the library only supports Qt v4.2 and later, +interesting we’ll also say that the library only supports TQt v4.2 and later, and also includes a function called <tt class="docutils literal"><span class="pre">setDefault()</span></tt> that is not implemented in the Windows version of the library.</p> <p>The <tt class="docutils literal"><span class="pre">hello.h</span></tt> header file looks something like this:</p> @@ -251,12 +251,13 @@ in the Windows version of the library.</p> #include <qwidget.h> #include <qstring.h> -class Hello : public QLabel { - // This is needed by the Qt Meta-Object Compiler. +class Hello : public TQLabel { + // This is needed by the TQt Meta-Object Compiler. Q_OBJECT + TQ_OBJECT public: - Hello(QWidget *parent = 0); + Hello(TQWidget *parent = 0); private: // Prevent instances from being copied. @@ -265,7 +266,7 @@ private: }; #if !defined(Q_OS_WIN) -void setDefault(const QString &def); +void setDefault(const TQString &def); #endif</pre> </div> <p>The corresponding SIP specification file would then look something like this:</p> @@ -273,25 +274,25 @@ void setDefault(const QString &def); %Module hello 0 -%Import QtGui/QtGuimod.sip +%Import TQtGui/TQtGuimod.sip -%If (Qt_4_2_0 -) +%If (TQt_4_2_0 -) -class Hello : QLabel { +class Hello : TQLabel { %TypeHeaderCode #include <hello.h> %End public: - Hello(QWidget *parent /TransferThis/ = 0); + Hello(TQWidget *parent /TransferThis/ = 0); private: Hello(const Hello &); }; %If (!WS_WIN) -void setDefault(const QString &def); +void setDefault(const TQString &def); %End %End</pre> @@ -301,12 +302,12 @@ previous examples.</p> <blockquote> <ul class="simple"> <li>The <a class="reference external" href="directives.html#directive-%Import"><tt class="xref docutils literal"><span class="pre">%Import</span></tt></a> directive has been added to specify that we are -extending the class hierarchy defined in the file <tt class="docutils literal"><span class="pre">QtGui/QtGuimod.sip</span></tt>. -This file is part of PyQt. The build system will take care of finding +extending the class hierarchy defined in the file <tt class="docutils literal"><span class="pre">TQtGui/TQtGuimod.sip</span></tt>. +This file is part of PyTQt. The build system will take care of finding the file’s exact location.</li> <li>The <a class="reference external" href="directives.html#directive-%If"><tt class="xref docutils literal"><span class="pre">%If</span></tt></a> directive has been added to specify that everything -<a class="footnote-reference" href="#id11" id="id8">[4]</a> up to the matching <a class="reference external" href="directives.html#directive-%End"><tt class="xref docutils literal"><span class="pre">%End</span></tt></a> directive only applies to Qt -v4.2 and later. <tt class="docutils literal"><span class="pre">Qt_4_2_0</span></tt> is a <em>tag</em> defined in <tt class="docutils literal"><span class="pre">QtCoremod.sip</span></tt> +<a class="footnote-reference" href="#id11" id="id8">[4]</a> up to the matching <a class="reference external" href="directives.html#directive-%End"><tt class="xref docutils literal"><span class="pre">%End</span></tt></a> directive only applies to TQt +v4.2 and later. <tt class="docutils literal"><span class="pre">TQt_4_2_0</span></tt> is a <em>tag</em> defined in <tt class="docutils literal"><span class="pre">TQtCoremod.sip</span></tt> <a class="footnote-reference" href="#id12" id="id9">[5]</a> using the <a class="reference external" href="directives.html#directive-%Timeline"><tt class="xref docutils literal"><span class="pre">%Timeline</span></tt></a> directive. <a class="reference external" href="directives.html#directive-%Timeline"><tt class="xref docutils literal"><span class="pre">%Timeline</span></tt></a> is used to define a tag for each version of a library’s API you are wrapping allowing you to maintain all the different versions in a single @@ -318,9 +319,9 @@ removed. This is not supported by SIP.</li> <li>The <a class="reference external" href="annotations.html#aanno-TransferThis"><tt class="xref docutils literal"><span class="pre">TransferThis</span></tt></a> annotation has been added to the constructor’s argument. It specifies that if the argument is not 0 (i.e. the <tt class="docutils literal"><span class="pre">Hello</span></tt> 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 <tt class="docutils literal"><span class="pre">QObject</span></tt> class) in a -hierachy. When an object is destroyed all of its children are also +is transferred from Python to C++. It is needed because TQt maintains +objects (i.e. instances derived from the <tt class="docutils literal"><span class="pre">TQObject</span></tt> class) in a +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 <a class="reference internal" href="#ref-object-ownership"><em>Ownership of Objects</em></a>. SIP provides many other @@ -331,7 +332,7 @@ values.</li> SIP.</li> <li>The <a class="reference external" href="directives.html#directive-%If"><tt class="xref docutils literal"><span class="pre">%If</span></tt></a> directive has been added to specify that everything up to the matching <a class="reference external" href="directives.html#directive-%End"><tt class="xref docutils literal"><span class="pre">%End</span></tt></a> directive does not apply to Windows. -<tt class="docutils literal"><span class="pre">WS_WIN</span></tt> is another tag defined by PyQt, this time using the +<tt class="docutils literal"><span class="pre">WS_WIN</span></tt> is another tag defined by PyTQt, this time using the <a class="reference external" href="directives.html#directive-%Platforms"><tt class="xref docutils literal"><span class="pre">%Platforms</span></tt></a> directive. Tags defined by the <a class="reference external" href="directives.html#directive-%Platforms"><tt class="xref docutils literal"><span class="pre">%Platforms</span></tt></a> directive are mutually exclusive, i.e. only one may be valid at a time <a class="footnote-reference" href="#id13" id="id10">[6]</a>.</li> @@ -342,9 +343,9 @@ copy constructor when it can never be called from Python? The answer is to prevent the automatic generation of a public copy constructor.</p> <p>We now look at the <tt class="docutils literal"><span class="pre">configure.py</span></tt> script. This is a little different to the script in the previous examples for two related reasons.</p> -<p>Firstly, PyQt includes a pure Python module called <tt class="docutils literal"><span class="pre">pyqtconfig</span></tt> that extends -the SIP build system for modules, like our example, that build on top of PyQt. -It deals with the details of which version of Qt is being used (i.e. it +<p>Firstly, PyTQt includes a pure Python module called <tt class="docutils literal"><span class="pre">pyqtconfig</span></tt> that extends +the SIP build system for modules, like our example, that build on top of PyTQt. +It deals with the details of which version of TQt is being used (i.e. it determines what the correct tags are) and where it is installed. This is called a module’s configuration module.</p> <p>Secondly, we generate a configuration module (called <tt class="docutils literal"><span class="pre">helloconfig</span></tt>) for our @@ -354,16 +355,16 @@ life easier for them.</p> <p>Now we have two scripts. First the <tt class="docutils literal"><span class="pre">configure.py</span></tt> script:</p> <div class="highlight-python"><div class="highlight"><pre><span class="kn">import</span> <span class="nn">os</span> <span class="kn">import</span> <span class="nn">sipconfig</span> -<span class="kn">from</span> <span class="nn">PyQt4</span> <span class="kn">import</span> <span class="n">pyqtconfig</span> +<span class="kn">from</span> <span class="nn">PyTQt4</span> <span class="kn">import</span> <span class="n">pyqtconfig</span> <span class="c"># The name of the SIP build file generated by SIP and used by the build</span> <span class="c"># system.</span> <span class="n">build_file</span> <span class="o">=</span> <span class="s">"hello.sbf"</span> -<span class="c"># Get the PyQt configuration information.</span> +<span class="c"># Get the PyTQt configuration information.</span> <span class="n">config</span> <span class="o">=</span> <span class="n">pyqtconfig</span><span class="o">.</span><span class="n">Configuration</span><span class="p">()</span> -<span class="c"># Get the extra SIP flags needed by the imported PyQt modules. Note that</span> +<span class="c"># Get the extra SIP flags needed by the imported PyTQt modules. Note that</span> <span class="c"># this normally only includes those flags (-x and -t) that relate to SIP's</span> <span class="c"># versioning system.</span> <span class="n">pyqt_sip_flags</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">pyqt_sip_flags</span> @@ -380,10 +381,10 @@ life easier for them.</p> <span class="n">installs</span><span class="o">.</span><span class="n">append</span><span class="p">([</span><span class="s">"helloconfig.py"</span><span class="p">,</span> <span class="n">config</span><span class="o">.</span><span class="n">default_mod_dir</span><span class="p">])</span> -<span class="c"># Create the Makefile. The QtGuiModuleMakefile class provided by the</span> +<span class="c"># Create the Makefile. The TQtGuiModuleMakefile class provided by the</span> <span class="c"># pyqtconfig module takes care of all the extra preprocessor, compiler and</span> -<span class="c"># linker flags needed by the Qt library.</span> -<span class="n">makefile</span> <span class="o">=</span> <span class="n">pyqtconfig</span><span class="o">.</span><span class="n">QtGuiModuleMakefile</span><span class="p">(</span> +<span class="c"># linker flags needed by the TQt library.</span> +<span class="n">makefile</span> <span class="o">=</span> <span class="n">pyqtconfig</span><span class="o">.</span><span class="n">TQtGuiModuleMakefile</span><span class="p">(</span> <span class="n">configuration</span><span class="o">=</span><span class="n">config</span><span class="p">,</span> <span class="n">build_file</span><span class="o">=</span><span class="n">build_file</span><span class="p">,</span> <span class="n">installs</span><span class="o">=</span><span class="n">installs</span> @@ -418,7 +419,7 @@ life easier for them.</p> </pre></div> </div> <p>Next we have the <tt class="docutils literal"><span class="pre">helloconfig.py.in</span></tt> template script:</p> -<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">PyQt4</span> <span class="kn">import</span> <span class="n">pyqtconfig</span> +<div class="highlight-python"><div class="highlight"><pre><span class="kn">from</span> <span class="nn">PyTQt4</span> <span class="kn">import</span> <span class="n">pyqtconfig</span> <span class="c"># These are installation specific values created when Hello was configured.</span> <span class="c"># The following line will be replaced when this template is used to create</span> @@ -445,7 +446,7 @@ life easier for them.</p> <span class="n">pyqtconfig</span><span class="o">.</span><span class="n">Configuration</span><span class="o">.</span><span class="n">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">cfg</span><span class="p">)</span> -<span class="k">class</span> <span class="nc">HelloModuleMakefile</span><span class="p">(</span><span class="n">pyqtconfig</span><span class="o">.</span><span class="n">QtGuiModuleMakefile</span><span class="p">):</span> +<span class="k">class</span> <span class="nc">HelloModuleMakefile</span><span class="p">(</span><span class="n">pyqtconfig</span><span class="o">.</span><span class="n">TQtGuiModuleMakefile</span><span class="p">):</span> <span class="sd">"""The Makefile class for modules that %Import hello.</span> <span class="sd"> """</span> <span class="k">def</span> <span class="nf">finalise</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span> @@ -455,7 +456,7 @@ life easier for them.</p> <span class="bp">self</span><span class="o">.</span><span class="n">extra_libs</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="s">"hello"</span><span class="p">)</span> <span class="c"># Let the super-class do what it needs to.</span> - <span class="n">pyqtconfig</span><span class="o">.</span><span class="n">QtGuiModuleMakefile</span><span class="o">.</span><span class="n">finalise</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> + <span class="n">pyqtconfig</span><span class="o">.</span><span class="n">TQtGuiModuleMakefile</span><span class="o">.</span><span class="n">finalise</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> </pre></div> </div> <p>Again, we hope that the scripts are self documenting.</p> @@ -468,8 +469,8 @@ life easier for them.</p> <table class="docutils footnote" frame="void" id="id12" rules="none"> <colgroup><col class="label" /><col /></colgroup> <tbody valign="top"> -<tr><td class="label"><a class="fn-backref" href="#id9">[5]</a></td><td>Actually in <tt class="docutils literal"><span class="pre">versions.sip</span></tt>. PyQt uses the <a class="reference external" href="directives.html#directive-%Include"><tt class="xref docutils literal"><span class="pre">%Include</span></tt></a> -directive to split the SIP specification for Qt across a large number of +<tr><td class="label"><a class="fn-backref" href="#id9">[5]</a></td><td>Actually in <tt class="docutils literal"><span class="pre">versions.sip</span></tt>. PyTQt uses the <a class="reference external" href="directives.html#directive-%Include"><tt class="xref docutils literal"><span class="pre">%Include</span></tt></a> +directive to split the SIP specification for TQt across a large number of separate <tt class="docutils literal"><span class="pre">.sip</span></tt> files.</td></tr> </tbody> </table> @@ -535,13 +536,13 @@ by importing modules.</p> sub-classed from one of the SIP provided types. Your types must be registered using <a title="sipRegisterPyType" class="reference external" href="c_api.html#sipRegisterPyType"><tt class="xref docutils literal"><span class="pre">sipRegisterPyType()</span></tt></a>. This is normally done in code specified using the <a class="reference external" href="directives.html#directive-%InitialisationCode"><tt class="xref docutils literal"><span class="pre">%InitialisationCode</span></tt></a> directive.</p> -<p>As an example, PyQt4 uses <a class="reference external" href="directives.html#directive-%DefaultMetatype"><tt class="xref docutils literal"><span class="pre">%DefaultMetatype</span></tt></a> to specify a new -meta-type that handles the interaction with Qt’s own meta-type system. It also +<p>As an example, PyTQt4 uses <a class="reference external" href="directives.html#directive-%DefaultMetatype"><tt class="xref docutils literal"><span class="pre">%DefaultMetatype</span></tt></a> to specify a new +meta-type that handles the interaction with TQt’s own meta-type system. It also uses <a class="reference external" href="directives.html#directive-%DefaultSupertype"><tt class="xref docutils literal"><span class="pre">%DefaultSupertype</span></tt></a> to specify that the smaller <tt class="xref docutils literal"><span class="pre">sip.simplewrapper</span></tt> super-type is normally used. Finally it uses -<a class="reference external" href="annotations.html#canno-Supertype"><tt class="xref docutils literal"><span class="pre">Supertype</span></tt></a> as an annotation of the <tt class="docutils literal"><span class="pre">QObject</span></tt> class to override the +<a class="reference external" href="annotations.html#canno-Supertype"><tt class="xref docutils literal"><span class="pre">Supertype</span></tt></a> as an annotation of the <tt class="docutils literal"><span class="pre">TQObject</span></tt> class to override the default and use <a title="sip.wrapper" class="reference external" href="python_api.html#sip.wrapper"><tt class="xref docutils literal"><span class="pre">sip.wrapper</span></tt></a> as the super-type so that the parent/child -relationships of <tt class="docutils literal"><span class="pre">QObject</span></tt> instances are properly maintained.</p> +relationships of <tt class="docutils literal"><span class="pre">TQObject</span></tt> instances are properly maintained.</p> </div> <div class="section" id="lazy-type-attributes"> <span id="ref-lazy-type-attributes"></span><h2>Lazy Type Attributes<a class="headerlink" href="#lazy-type-attributes" title="Permalink to this headline">¶</a></h2> @@ -566,8 +567,8 @@ ignored.</p> <div class="section" id="support-for-wide-characters"> <h2>Support for Wide Characters<a class="headerlink" href="#support-for-wide-characters" title="Permalink to this headline">¶</a></h2> <p>SIP v4.6 introduced support for wide characters (i.e. the <tt class="docutils literal"><span class="pre">wchar_t</span></tt> 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 <a title="sipMalloc" class="reference external" href="c_api.html#sipMalloc"><tt class="xref docutils literal"><span class="pre">sipMalloc()</span></tt></a>). This then raises the problem of how this memory is subsequently freed.</p> diff --git a/sipgen/export.c b/sipgen/export.c index 641ea32..4c741c1 100644 --- a/sipgen/export.c +++ b/sipgen/export.c @@ -762,7 +762,7 @@ static void xmlType(sipSpec *pt, argDef *ad, int sec, FILE *fp) { int a; - prcode(fp, "SLOT("); + prcode(fp, "TQT_SLOT("); for (a = 0; a < ad->u.sa->nrArgs; ++a) { @@ -956,11 +956,11 @@ static const char *pyType(sipSpec *pt, argDef *ad, int sec, classDef **scope) break; case signal_type: - type_name = "SIGNAL()"; + type_name = "TQT_SIGNAL()"; break; case slot_type: - type_name = "SLOT()"; + type_name = "TQT_SLOT()"; break; case rxcon_type: @@ -968,12 +968,12 @@ static const char *pyType(sipSpec *pt, argDef *ad, int sec, classDef **scope) if (sec) type_name = "callable"; else - type_name = "QObject"; + type_name = TQOBJECT_OBJECT_NAME_STRING; break; case qobject_type: - type_name = "QObject"; + type_name = TQOBJECT_OBJECT_NAME_STRING; break; case ustring_type: @@ -1044,7 +1044,7 @@ static const char *pyType(sipSpec *pt, argDef *ad, int sec, classDef **scope) case slotcon_type: case anyslot_type: - type_name = "SLOT()"; + type_name = "TQT_SLOT()"; break; default: diff --git a/sipgen/gencode.c b/sipgen/gencode.c index b0c3d01..bd9fc11 100644 --- a/sipgen/gencode.c +++ b/sipgen/gencode.c @@ -500,10 +500,10 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod, , mname , mname); - if (pluginPyQt4(pt)) + if (pluginPyTQt4(pt)) prcode(fp, "\n" -"#include <QMetaType>\n" +"#include <TQMetaType>\n" ); /* Define the enabled features. */ @@ -639,8 +639,8 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod, "#define sipString_AsLatin1String sipAPI_%s->api_string_as_latin1_string\n" "#define sipString_AsUTF8Char sipAPI_%s->api_string_as_utf8_char\n" "#define sipString_AsUTF8String sipAPI_%s->api_string_as_utf8_string\n" -"#define sipUnicode_AsWChar sipAPI_%s->api_unicode_as_wchar\n" -"#define sipUnicode_AsWString sipAPI_%s->api_unicode_as_wstring\n" +"#define sipUnicode_AsWChar sipAPI_%s->api_tqunicode_as_wchar\n" +"#define sipUnicode_AsWString sipAPI_%s->api_tqunicode_as_wstring\n" "#define sipConvertFromConstVoidPtr sipAPI_%s->api_convert_from_const_void_ptr\n" "#define sipConvertFromVoidPtrAndSize sipAPI_%s->api_convert_from_void_ptr_and_size\n" "#define sipConvertFromConstVoidPtrAndSize sipAPI_%s->api_convert_from_const_void_ptr_and_size\n" @@ -802,13 +802,13 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod, , mname, mld->module->name); } - if (pluginPyQt4(pt)) + if (pluginPyTQt4(pt)) prcode(fp, "\n" -"typedef const QMetaObject *(*sip_qt_metaobject_func)(sipSimpleWrapper *,sipTypeDef *);\n" +"typedef const TQMetaObject *(*sip_qt_metaobject_func)(sipSimpleWrapper *,sipTypeDef *);\n" "extern sip_qt_metaobject_func sip_%s_qt_metaobject;\n" "\n" -"typedef int (*sip_qt_metacall_func)(sipSimpleWrapper *,sipTypeDef *,QMetaObject::Call,int,void **);\n" +"typedef int (*sip_qt_metacall_func)(sipSimpleWrapper *,sipTypeDef *,TQMetaObject::Call,int,void **);\n" "extern sip_qt_metacall_func sip_%s_qt_metacall;\n" "\n" "typedef int (*sip_qt_metacast_func)(sipSimpleWrapper *,sipTypeDef *,const char *);\n" @@ -873,7 +873,7 @@ static void generateCompositeCpp(sipSpec *pt, const char *codeDir) "\n" " /*\n" " * Note that we don't complain if the module can't be imported. This\n" -" * is a favour to Linux distro packagers who like to split PyQt into\n" +" * is a favour to Linux distro packagers who like to split PyTQt into\n" " * different sub-packages.\n" " */\n" " if (mod)\n" @@ -1199,23 +1199,23 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir, /* * Include the library headers for types used by virtual handlers, module - * level functions, module level variables and Qt meta types. + * level functions, module level variables and TQt meta types. */ generateUsedIncludes(mod->used, fp); /* - * If there should be a Qt support API then generate stubs values for the + * If there should be a TQt support API then generate stubs values for the * optional parts. These should be undefined in %ModuleCode if a C++ * implementation is provided. */ if (mod->qobjclass >= 0) prcode(fp, "\n" -"#define sipQtCreateUniversalSignal 0\n" -"#define sipQtFindUniversalSignal 0\n" -"#define sipQtEmitSignal 0\n" -"#define sipQtConnectPySignal 0\n" -"#define sipQtDisconnectPySignal 0\n" +"#define sipTQtCreateUniversalSignal 0\n" +"#define sipTQtFindUniversalSignal 0\n" +"#define sipTQtEmitSignal 0\n" +"#define sipTQtConnectPySignal 0\n" +"#define sipTQtDisconnectPySignal 0\n" ); /* Define the names. */ @@ -1394,7 +1394,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir, prcode(fp, " {%d, \"", cd->iff->ifacenr); - prScopedName(fp, classFQCName(cd), "."); + prScopedName(fp, classFTQCName(cd), "."); prcode(fp,"\"},\n" ); } @@ -1620,7 +1620,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir, continue; prcode(fp, -" {sipSubClass_%C, ",classFQCName(cd)); +" {sipSubClass_%C, ",classFTQCName(cd)); generateEncodedType(mod, cd->subbase, 0, fp); @@ -1787,27 +1787,27 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir, "};\n" ); - /* Generate any Qt support API. */ + /* Generate any TQt support API. */ if (mod->qobjclass >= 0) prcode(fp, "\n" "\n" -"/* This defines the Qt support API. */\n" +"/* This defines the TQt support API. */\n" "\n" -"static sipQtAPI qtAPI = {\n" +"static sipTQtAPI qtAPI = {\n" " &typesTable[%d],\n" -" sipQtCreateUniversalSignal,\n" -" sipQtFindUniversalSignal,\n" -" sipQtCreateUniversalSlot,\n" -" sipQtDestroyUniversalSlot,\n" -" sipQtFindSlot,\n" -" sipQtConnect,\n" -" sipQtDisconnect,\n" -" sipQtSameSignalSlotName,\n" -" sipQtFindSipslot,\n" -" sipQtEmitSignal,\n" -" sipQtConnectPySignal,\n" -" sipQtDisconnectPySignal\n" +" sipTQtCreateUniversalSignal,\n" +" sipTQtFindUniversalSignal,\n" +" sipTQtCreateUniversalSlot,\n" +" sipTQtDestroyUniversalSlot,\n" +" sipTQtFindSlot,\n" +" sipTQtConnect,\n" +" sipTQtDisconnect,\n" +" sipTQtSameSignalSlotName,\n" +" sipTQtFindSipslot,\n" +" sipTQtEmitSignal,\n" +" sipTQtConnectPySignal,\n" +" sipTQtDisconnectPySignal\n" "};\n" , mod->qobjclass); @@ -1889,7 +1889,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir, "const sipExportedModuleDef *sipModuleAPI_%s_%s;\n" , mname, mld->module->name); - if (pluginPyQt4(pt)) + if (pluginPyTQt4(pt)) prcode(fp, "\n" "sip_qt_metaobject_func sip_%s_qt_metaobject;\n" @@ -2016,7 +2016,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir, " }\n" , mname); - if (pluginPyQt4(pt)) + if (pluginPyTQt4(pt)) { /* Import the helpers. */ prcode(fp, @@ -2161,7 +2161,7 @@ static void generateTypesTable(sipSpec *pt, moduleDef *mod, FILE *fp) argDef *ad; const char *type_suffix; - type_suffix = (pluginPyQt4(pt) || pluginPyQt3(pt)) ? ".super" : ""; + type_suffix = (pluginPyTQt4(pt) || pluginPyTQt3(pt)) ? ".super" : ""; prcode(fp, "\n" @@ -2389,7 +2389,7 @@ static int generateSubClassConvertors(sipSpec *pt, moduleDef *mod, FILE *fp) if (!generating_c) prcode(fp, "extern \"C\" {static const sipTypeDef *sipSubClass_%C(void **);}\n" - , classFQCName(cd)); + , classFTQCName(cd)); /* Allow the deprecated use of sipClass rather than sipType. */ needs_sipClass = usedInCode(cd->convtosubcode, "sipClass"); @@ -2398,8 +2398,8 @@ static int generateSubClassConvertors(sipSpec *pt, moduleDef *mod, FILE *fp) "static const sipTypeDef *sipSubClass_%C(void **sipCppRet)\n" "{\n" " %S *sipCpp = reinterpret_cast<%S *>(*sipCppRet);\n" - , classFQCName(cd) - , classFQCName(cd->subbase), classFQCName(cd->subbase)); + , classFTQCName(cd) + , classFTQCName(cd->subbase), classFTQCName(cd->subbase)); if (needs_sipClass) prcode(fp, @@ -2740,11 +2740,11 @@ static int generateEnumMemberTable(sipSpec *pt, moduleDef *mod, classDef *cd, if (cd != NULL) { if (isProtectedEnum(emd->ed)) - prcode(fp, "sip%C::", classFQCName(cd)); + prcode(fp, "sip%C::", classFTQCName(cd)); else if (isProtectedClass(cd)) prcode(fp, "%U::", cd); else - prcode(fp, "%S::", classFQCName(cd)); + prcode(fp, "%S::", classFTQCName(cd)); } else if (mtd != NULL) { @@ -2859,7 +2859,7 @@ static void generateTypesInline(sipSpec *pt, moduleDef *mod, FILE *fp) if (vd->ecd == NULL) prcode(fp, "sipModuleDict"); else - prcode(fp, "(PyObject *)sipTypeAsPyTypeObject(sipType_%C)", classFQCName(vd->ecd)); + prcode(fp, "(PyObject *)sipTypeAsPyTypeObject(sipType_%C)", classFTQCName(vd->ecd)); prcode(fp, ",%N,", vd->pyname); @@ -2870,7 +2870,7 @@ static void generateTypesInline(sipSpec *pt, moduleDef *mod, FILE *fp) if (vd->type.atype == class_type) prcode(fp, ",sipType_%C);\n" - , classFQCName(vd->type.u.cd)); + , classFTQCName(vd->type.u.cd)); else if (vd->type.atype == enum_type) prcode(fp, ",sipType_%C);\n" , vd->type.u.ed->fqcname); @@ -2921,7 +2921,7 @@ static int generateClasses(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp) "\n" "/* Define the class and enum instances to be added to this type dictionary. */\n" "static sipTypeInstanceDef typeInstances_%C[] = {\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, "\n" @@ -2938,7 +2938,7 @@ static int generateClasses(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp) if (vd->type.atype == class_type) { - scopedNameDef *vcname = classFQCName(vd->type.u.cd); + scopedNameDef *vcname = classFTQCName(vd->type.u.cd); if (vd->accessfunc != NULL) { @@ -3007,7 +3007,7 @@ static int generateVoidPointers(sipSpec *pt, moduleDef *mod, classDef *cd, "\n" "/* Define the void pointers to be added to this type dictionary. */\n" "static sipVoidPtrInstanceDef voidPtrInstances_%C[] = {\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, "\n" @@ -3071,7 +3071,7 @@ static int generateChars(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp) "\n" "/* Define the chars to be added to this type dictionary. */\n" "static sipCharInstanceDef charInstances_%C[] = {\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, "\n" @@ -3130,7 +3130,7 @@ static int generateStrings(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp) "\n" "/* Define the strings to be added to this type dictionary. */\n" "static sipStringInstanceDef stringInstances_%C[] = {\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, "\n" @@ -3247,7 +3247,7 @@ static void ints_intro(classDef *cd, FILE *fp) "\n" "/* Define the ints to be added to this type dictionary. */\n" "static sipIntInstanceDef intInstances_%C[] = {\n" - ,classFQCName(cd)); + ,classFTQCName(cd)); else prcode(fp, "\n" @@ -3336,7 +3336,7 @@ static int generateVariableType(sipSpec *pt, moduleDef *mod, classDef *cd, "/* Define the %ss to be added to this type dictionary. */\n" "static sip%sInstanceDef %sInstances_%C[] = {\n" , eng - , s1, s2, classFQCName(cd)); + , s1, s2, classFTQCName(cd)); else prcode(fp, "\n" @@ -3396,7 +3396,7 @@ static int generateDoubles(sipSpec *pt, moduleDef *mod, classDef *cd, FILE *fp) "\n" "/* Define the doubles to be added to this type dictionary. */\n" "static sipDoubleInstanceDef doubleInstances_%C[] = {\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, "\n" @@ -3813,7 +3813,7 @@ static void generateTypeDefLink(sipSpec *pt, ifaceFileDef *iff, FILE *fp) if (iff->next_alt->type == mappedtype_iface) prcode(fp, ".mtd_base"); - else if (pluginPyQt3(pt) || pluginPyQt4(pt)) + else if (pluginPyTQt3(pt) || pluginPyTQt4(pt)) prcode(fp, ".super.ctd_base"); else prcode(fp, ".ctd_base"); @@ -4230,11 +4230,11 @@ static void generateVariableGetter(ifaceFileDef *scope, varDef *vd, FILE *fp) if (generating_c) prcode(fp, " %S *sipCpp = (%S *)sipSelf;\n" - , classFQCName(vd->ecd), classFQCName(vd->ecd)); + , classFTQCName(vd->ecd), classFTQCName(vd->ecd)); else prcode(fp, " %S *sipCpp = reinterpret_cast<%S *>(sipSelf);\n" - , classFQCName(vd->ecd), classFQCName(vd->ecd)); + , classFTQCName(vd->ecd), classFTQCName(vd->ecd)); prcode(fp, "\n" @@ -4559,11 +4559,11 @@ static void generateVariableSetter(ifaceFileDef *scope, varDef *vd, FILE *fp) if (generating_c) prcode(fp, " %S *sipCpp = (%S *)sipSelf;\n" - , classFQCName(vd->ecd), classFQCName(vd->ecd)); + , classFTQCName(vd->ecd), classFTQCName(vd->ecd)); else prcode(fp, " %S *sipCpp = reinterpret_cast<%S *>(sipSelf);\n" - , classFQCName(vd->ecd), classFQCName(vd->ecd)); + , classFTQCName(vd->ecd), classFTQCName(vd->ecd)); prcode(fp, "\n" @@ -4656,7 +4656,7 @@ static void generateVariableSetter(ifaceFileDef *scope, varDef *vd, FILE *fp) prcode(fp, "\n" " sipReleaseType(sipVal, sipType_%C, sipValState);\n" - , classFQCName(vd->type.u.cd)); + , classFTQCName(vd->type.u.cd)); else if (vd->type.atype == mapped_type && vd->type.nrderefs == 0 && !noRelease(vd->type.u.mtd)) prcode(fp, "\n" @@ -4702,7 +4702,7 @@ static void generateVariableSetter(ifaceFileDef *scope, varDef *vd, FILE *fp) static void generateVarMember(varDef *vd, FILE *fp) { if (isStaticVar(vd)) - prcode(fp,"%S::",classFQCName(vd->ecd)); + prcode(fp,"%S::",classFTQCName(vd->ecd)); else prcode(fp,"sipCpp->"); @@ -4772,7 +4772,7 @@ static int generateObjToCppConversion(argDef *ad,FILE *fp) * all types). */ - prcode(fp, "sipForceConvertToType(sipPy,sipType_%C,NULL,%s,%s,&sipIsErr)", classFQCName(ad->u.cd), (ad->nrderefs ? "0" : "SIP_NOT_NONE"), (might_be_temp ? "&sipValState" : "NULL")); + prcode(fp, "sipForceConvertToType(sipPy,sipType_%C,NULL,%s,%s,&sipIsErr)", classFTQCName(ad->u.cd), (ad->nrderefs ? "0" : "SIP_NOT_NONE"), (might_be_temp ? "&sipValState" : "NULL")); prcode(fp, "%s;\n" , tail); @@ -5078,7 +5078,7 @@ static void generateSlot(moduleDef *mod, classDef *cd, enumDef *ed, { prefix = "Type"; pyname = cd->pyname; - fqcname = classFQCName(cd); + fqcname = classFTQCName(cd); overs = cd->overs; } else @@ -5335,7 +5335,7 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, for (md = cd->members; md != NULL; md = md->next) if (cd->iff->type == namespace_iface) generateOrdinaryFunction(pt, mod, cd, NULL, md, fp); - else if (md->slot != no_slot && md->slot != unicode_slot) + else if (md->slot != no_slot && md->slot != tqunicode_slot) generateSlot(mod, cd, NULL, md, fp); if (cd->iff->type != namespace_iface && !generating_c) @@ -5363,7 +5363,7 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, prcode(fp, " if (targetType == sipType_%C)\n" " return ptr;\n" - ,classFQCName(cd)); + ,classFTQCName(cd)); for (cl = cd->supers; cl != NULL; cl = cl->next) { @@ -5373,7 +5373,7 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, "\n" " if ((res = ((const sipClassTypeDef *)sipType_%C)->ctd_cast((%S *)(%S *)ptr,targetType)) != NULL)\n" " return res;\n" - ,sname,sname,classFQCName(cd)); + ,sname,sname,classFTQCName(cd)); } prcode(fp, @@ -5454,7 +5454,7 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, prcode(fp, " if (sipState & SIP_DERIVED_CLASS)\n" " delete reinterpret_cast<sip%C *>(sipCppV);\n" - , classFQCName(cd)); + , classFTQCName(cd)); if (isPublicDtor(cd)) prcode(fp, @@ -5490,12 +5490,12 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (!generating_c) prcode(fp, "extern \"C\" {static int traverse_%C(void *, visitproc, void *);}\n" - , classFQCName(cd)); + , classFTQCName(cd)); prcode(fp, "static int traverse_%C(void *sipCppV,visitproc sipVisit,void *sipArg)\n" "{\n" -" ", classFQCName(cd)); +" ", classFTQCName(cd)); generateClassFromVoid(cd, "sipCpp", "sipCppV", fp); @@ -5524,12 +5524,12 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (!generating_c) prcode(fp, "extern \"C\" {static int clear_%C(void *);}\n" - , classFQCName(cd)); + , classFTQCName(cd)); prcode(fp, "static int clear_%C(void *sipCppV)\n" "{\n" -" ", classFQCName(cd)); +" ", classFTQCName(cd)); generateClassFromVoid(cd, "sipCpp", "sipCppV", fp); @@ -5561,12 +5561,12 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (!generating_c) prcode(fp, "extern \"C\" {static int getbuffer_%C(PyObject *, void *, Py_buffer *, int);}\n" - , classFQCName(cd)); + , classFTQCName(cd)); prcode(fp, "static int getbuffer_%C(PyObject *%s, void *%s, Py_buffer *sipBuffer, int %s)\n" "{\n" - , classFQCName(cd), argName("sipSelf", cd->getbufcode), (generating_c || need_cpp ? "sipCppV" : ""), argName("sipFlags", cd->getbufcode)); + , classFTQCName(cd), argName("sipSelf", cd->getbufcode), (generating_c || need_cpp ? "sipCppV" : ""), argName("sipFlags", cd->getbufcode)); if (need_cpp) { @@ -5602,12 +5602,12 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (!generating_c) prcode(fp, "extern \"C\" {static void releasebuffer_%C(PyObject *, void *, Py_buffer *);}\n" - , classFQCName(cd)); + , classFTQCName(cd)); prcode(fp, "static void releasebuffer_%C(PyObject *%s, void *sipCppV, Py_buffer *)\n" "{\n" -" ", classFQCName(cd) +" ", classFTQCName(cd) , argName("sipSelf", cd->releasebufcode)); generateClassFromVoid(cd, "sipCpp", "sipCppV", fp); @@ -5635,12 +5635,12 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (!generating_c) prcode(fp, "extern \"C\" {static SIP_SSIZE_T getreadbuffer_%C(PyObject *, void *, SIP_SSIZE_T, void **);}\n" - , classFQCName(cd)); + , classFTQCName(cd)); prcode(fp, "static SIP_SSIZE_T getreadbuffer_%C(PyObject *%s, void *sipCppV, SIP_SSIZE_T %s, void **%s)\n" "{\n" -" ", classFQCName(cd) +" ", classFTQCName(cd) , argName("sipSelf", cd->readbufcode) , argName("sipSegment", cd->readbufcode) , argName("sipPtrPtr", cd->readbufcode)); @@ -5673,12 +5673,12 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (!generating_c) prcode(fp, "extern \"C\" {static SIP_SSIZE_T getwritebuffer_%C(PyObject *, void *, SIP_SSIZE_T, void **);}\n" - , classFQCName(cd)); + , classFTQCName(cd)); prcode(fp, "static SIP_SSIZE_T getwritebuffer_%C(PyObject *%s, void *sipCppV, SIP_SSIZE_T %s, void **%s)\n" "{\n" -" ", classFQCName(cd) +" ", classFTQCName(cd) , argName("sipSelf", cd->writebufcode) , argName("sipSegment", cd->writebufcode) , argName("sipPtrPtr", cd->writebufcode)); @@ -5711,12 +5711,12 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (!generating_c) prcode(fp, "extern \"C\" {static SIP_SSIZE_T getsegcount_%C(PyObject *, void *, SIP_SSIZE_T *);}\n" - , classFQCName(cd)); + , classFTQCName(cd)); prcode(fp, "static SIP_SSIZE_T getsegcount_%C(PyObject *%s, void *sipCppV, SIP_SSIZE_T *%s)\n" "{\n" -" ", classFQCName(cd) +" ", classFTQCName(cd) , argName("sipSelf", cd->segcountcode) , argName("sipLenPtr", cd->segcountcode)); @@ -5748,12 +5748,12 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (!generating_c) prcode(fp, "extern \"C\" {static SIP_SSIZE_T getcharbuffer_%C(PyObject *, void *, SIP_SSIZE_T, void **);}\n" - , classFQCName(cd)); + , classFTQCName(cd)); prcode(fp, "static SIP_SSIZE_T getcharbuffer_%C(PyObject *%s, void *sipCppV, SIP_SSIZE_T %s, void **%s)\n" "{\n" -" ", classFQCName(cd) +" ", classFTQCName(cd) , argName("sipSelf", cd->charbufcode) , argName("sipSegment", cd->charbufcode) , argName("sipPtrPtr", cd->charbufcode)); @@ -5786,12 +5786,12 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (!generating_c) prcode(fp, "extern \"C\" {static PyObject *pickle_%C(void *);}\n" - , classFQCName(cd)); + , classFTQCName(cd)); prcode(fp, "static PyObject *pickle_%C(void *sipCppV)\n" "{\n" -" ", classFQCName(cd)); +" ", classFTQCName(cd)); generateClassFromVoid(cd, "sipCpp", "sipCppV", fp); @@ -5830,11 +5830,11 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (generating_c) prcode(fp, " ((%S *)sipDst)[sipDstIdx] = *((const %S *)sipSrc);\n" - , classFQCName(cd), classFQCName(cd)); + , classFTQCName(cd), classFTQCName(cd)); else prcode(fp, " reinterpret_cast<%S *>(sipDst)[sipDstIdx] = *reinterpret_cast<const %S *>(sipSrc);\n" - , classFQCName(cd), classFQCName(cd)); + , classFTQCName(cd), classFTQCName(cd)); prcode(fp, "}\n" @@ -5859,11 +5859,11 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, if (generating_c) prcode(fp, " return sipMalloc(sizeof (%S) * sipNrElem);\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " return new %S[sipNrElem];\n" - , classFQCName(cd)); + , classFTQCName(cd)); prcode(fp, "}\n" @@ -5891,12 +5891,12 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, " *sipPtr = ((const %S *)sipSrc)[sipSrcIdx];\n" "\n" " return sipPtr;\n" - , classFQCName(cd), classFQCName(cd) - , classFQCName(cd)); + , classFTQCName(cd), classFTQCName(cd) + , classFTQCName(cd)); else prcode(fp, " return new %S(reinterpret_cast<const %S *>(sipSrc)[sipSrcIdx]);\n" - , classFQCName(cd), classFQCName(cd)); + , classFTQCName(cd), classFTQCName(cd)); prcode(fp, "}\n" @@ -5933,7 +5933,7 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd, " if (sipIsDerived(sipSelf))\n" " reinterpret_cast<sip%C *>(sipSelf->u.cppPtr)->sipPySelf = NULL;\n" "\n" - ,classFQCName(cd)); + ,classFTQCName(cd)); if (generating_c || isPublicDtor(cd) || (hasShadow(cd) && isProtectedDtor(cd))) { @@ -6005,11 +6005,11 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd, prcode(fp, "\n" -"sip%C::sip%C(",classFQCName(cd),classFQCName(cd)); +"sip%C::sip%C(",classFTQCName(cd),classFTQCName(cd)); generateCalledArgs(cd->iff, ct->cppsig, Definition, TRUE, fp); - prcode(fp,")%X: %S(",ct->exceptions,classFQCName(cd)); + prcode(fp,")%X: %S(",ct->exceptions,classFTQCName(cd)); generateProtectedCallArgs(ct->cppsig, fp); @@ -6020,7 +6020,7 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd, if (tracing) { prcode(fp, -" sipTrace(SIP_TRACE_CTORS,\"sip%C::sip%C(",classFQCName(cd),classFQCName(cd)); +" sipTrace(SIP_TRACE_CTORS,\"sip%C::sip%C(",classFTQCName(cd),classFTQCName(cd)); generateCalledArgs(cd->iff, ct->cppsig, Declaration, TRUE, fp); prcode(fp,")%X (this=0x%%08x)\\n\",this);\n" "\n" @@ -6045,13 +6045,13 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd, "\n" "sip%C::~sip%C()%X\n" "{\n" - ,classFQCName(cd),classFQCName(cd),cd->dtorexceptions); + ,classFTQCName(cd),classFTQCName(cd),cd->dtorexceptions); if (tracing) prcode(fp, " sipTrace(SIP_TRACE_DTORS,\"sip%C::~sip%C()%X (this=0x%%08x)\\n\",this);\n" "\n" - ,classFQCName(cd),classFQCName(cd),cd->dtorexceptions); + ,classFTQCName(cd),classFTQCName(cd),cd->dtorexceptions); if (cd->dtorcode != NULL) generateCppCodeBlock(cd->dtorcode,fp); @@ -6063,21 +6063,21 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd, } /* The meta methods if required. */ - if (pluginPyQt4(pt) && isQObjectSubClass(cd)) + if (pluginPyTQt4(pt) && isTQObjectSubClass(cd)) { - if (!noPyQt4QMetaObject(cd)) + if (!noPyTQt4TQMetaObject(cd)) prcode(fp, "\n" -"const QMetaObject *sip%C::metaObject() const\n" +"const TQMetaObject *sip%C::tqmetaObject() const\n" "{\n" " return sip_%s_qt_metaobject(sipPySelf,sipType_%C);\n" "}\n" - , classFQCName(cd) - , mod->name, classFQCName(cd)); + , classFTQCName(cd) + , mod->name, classFTQCName(cd)); prcode(fp, "\n" -"int sip%C::qt_metacall(QMetaObject::Call _c,int _id,void **_a)\n" +"int sip%C::qt_metacall(TQMetaObject::Call _c,int _id,void **_a)\n" "{\n" " _id = %S::qt_metacall(_c,_id,_a);\n" "\n" @@ -6091,11 +6091,11 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd, "{\n" " return (sip_%s_qt_metacast && sip_%s_qt_metacast(sipPySelf,sipType_%C,_clname)) ? this : %S::qt_metacast(_clname);\n" "}\n" - , classFQCName(cd) - , classFQCName(cd) - , mod->name, classFQCName(cd) - , classFQCName(cd) - , mod->name, mod->name, classFQCName(cd), classFQCName(cd)); + , classFTQCName(cd) + , classFTQCName(cd) + , mod->name, classFTQCName(cd) + , classFTQCName(cd) + , mod->name, mod->name, classFTQCName(cd), classFTQCName(cd)); } /* Generate the virtual catchers. */ @@ -6129,7 +6129,7 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd, generateProtectedDefinitions(cd,fp); /* Generate the emitters if needed. */ - if (pluginPyQt3(pt)) + if (pluginPyTQt3(pt)) generateEmitters(cd, fp); } @@ -6171,15 +6171,15 @@ static void generateEmitters(classDef *cd, FILE *fp) prcode(fp, "\n" -"static pyqt3QtSignal signals_%C[] = {\n" - ,classFQCName(cd)); +"static pyqt3TQtSignal signals_%C[] = {\n" + ,classFTQCName(cd)); noIntro = FALSE; } prcode(fp, " {%N, %C_emit_%s},\n" - ,vl->m->pyname,classFQCName(cd),vl->m->pyname->text); + ,vl->m->pyname,classFTQCName(cd),vl->m->pyname->text); break; } @@ -6232,7 +6232,7 @@ static void generateProtectedEnums(sipSpec *pt,classDef *cd,FILE *fp) for (emd = ed->members; emd != NULL; emd = emd->next) { prcode(fp,"%s" -" %s = %S::%s",eol,emd->cname,classFQCName(ed->ecd),emd->cname); +" %s = %S::%s",eol,emd->cname,classFTQCName(ed->ecd),emd->cname); eol = ",\n"; } @@ -6266,7 +6266,7 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr, generateBaseType(cd->iff, &od->cppsig->result, TRUE, fp); - prcode(fp," sip%C::%O(",classFQCName(cd),od); + prcode(fp," sip%C::%O(",classFTQCName(cd),od); generateCalledArgs(cd->iff, od->cppsig, Definition, TRUE, fp); prcode(fp,")%s%X\n" "{\n" @@ -6278,7 +6278,7 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr, " sipTrace(SIP_TRACE_CATCHERS,\""); generateBaseType(cd->iff, &od->cppsig->result, TRUE, fp); - prcode(fp," sip%C::%O(",classFQCName(cd),od); + prcode(fp," sip%C::%O(",classFTQCName(cd),od); generateCalledArgs(cd->iff, od->cppsig, Declaration, TRUE, fp); prcode(fp,")%s%X (this=0x%%08x)\\n\",this);\n" "\n" @@ -6394,7 +6394,7 @@ static void generateVirtualCatcher(moduleDef *mod, classDef *cd, int virtNr, /* Check that it has an API specified. */ if (avr == NULL) { - fatalScopedName(classFQCName(cd)); + fatalScopedName(classFTQCName(cd)); fatal("::"); prOverloadName(stderr, od); fatal(" has versioned and unversioned overloads\n"); @@ -6590,7 +6590,7 @@ static void generateUnambiguousClass(classDef *cd,classDef *scope,FILE *fp) for (cl = sub->cd->supers; cl != NULL; cl = cl->next) if (cl->cd == mro->cd) { - prcode(fp,"%S",classFQCName(sub->cd)); + prcode(fp,"%S",classFTQCName(sub->cd)); return; } @@ -6604,7 +6604,7 @@ static void generateUnambiguousClass(classDef *cd,classDef *scope,FILE *fp) } /* If we got here there is nothing to worry about. */ - prcode(fp,"%S",classFQCName(scope)); + prcode(fp,"%S",classFTQCName(scope)); } @@ -6685,7 +6685,7 @@ static void generateVirtHandlerErrorReturn(argDef *res, const char *indent, } else { - fatalScopedName(classFQCName(res->u.cd)); + fatalScopedName(classFTQCName(res->u.cd)); fatal(" must have a default constructor\n"); } } @@ -6757,7 +6757,7 @@ static void generateEmitter(classDef *cd, visibleList *vl, FILE *fp) "int sip%C::sipEmit_%s(PyObject *sipArgs)\n" "{\n" " PyObject *sipParseErr = NULL;\n" - ,classFQCName(cd),pname); + ,classFTQCName(cd),pname); for (od = vl->cd->overs; od != NULL; od = od->next) { @@ -6822,7 +6822,7 @@ static void generateEmitter(classDef *cd, visibleList *vl, FILE *fp) if (!generating_c) prcode(fp, "extern \"C\" {static int %C_emit_%s(sipSimpleWrapper *, PyObject *);}\n" - , classFQCName(cd), pname); + , classFTQCName(cd), pname); prcode(fp, "static int %C_emit_%s(sipSimpleWrapper *sw,PyObject *sipArgs)\n" @@ -6831,8 +6831,8 @@ static void generateEmitter(classDef *cd, visibleList *vl, FILE *fp) "\n" " return (ptr ? ptr->sipEmit_%s(sipArgs) : -1);\n" "}\n" - ,classFQCName(cd),pname - ,classFQCName(cd),classFQCName(cd) + ,classFTQCName(cd),pname + ,classFTQCName(cd),classFTQCName(cd) ,pname); } @@ -6943,13 +6943,13 @@ static void generateProtectedDefinitions(classDef *cd,FILE *fp) if (!isStatic(od) && !isAbstract(od) && (isVirtual(od) || isVirtualReimp(od))) { - prcode(fp, " sip%C::sipProtectVirt_%s(bool sipSelfWasArg", classFQCName(cd), mname); + prcode(fp, " sip%C::sipProtectVirt_%s(bool sipSelfWasArg", classFTQCName(cd), mname); if (od->cppsig->nrArgs > 0) prcode(fp, ","); } else - prcode(fp, " sip%C::sipProtect_%s(", classFQCName(cd), mname); + prcode(fp, " sip%C::sipProtect_%s(", classFTQCName(cd), mname); generateCalledArgs(cd->iff, od->cppsig, Definition, TRUE, fp); prcode(fp,")%s\n" @@ -6985,7 +6985,7 @@ static void generateProtectedDefinitions(classDef *cd,FILE *fp) { if (isVirtual(od) || isVirtualReimp(od)) { - prcode(fp, "(sipSelfWasArg ? %S::%s(", classFQCName(vl->cd), mname); + prcode(fp, "(sipSelfWasArg ? %S::%s(", classFTQCName(vl->cd), mname); generateProtectedCallArgs(od->cppsig, fp); @@ -6993,7 +6993,7 @@ static void generateProtectedDefinitions(classDef *cd,FILE *fp) ++parens; } else - prcode(fp, "%S::", classFQCName(vl->cd)); + prcode(fp, "%S::", classFTQCName(vl->cd)); } prcode(fp,"%s(",mname); @@ -7380,7 +7380,7 @@ static void generateParseResultExtraArgs(argDef *ad, int argnr, FILE *fp) break; case class_type: - prcode(fp, ",sipType_%C", classFQCName(ad->u.cd)); + prcode(fp, ",sipType_%C", classFTQCName(ad->u.cd)); break; case pytuple_type: @@ -7804,9 +7804,9 @@ static void generateTupleBuilder(signatureDef *sd,FILE *fp) if (ad->atype == mapped_type) prcode(fp, ",sipType_%T", ad); else if (ad->atype == fake_void_type || ad->atype == class_type) - prcode(fp, ",sipType_%C", classFQCName(ad->u.cd)); + prcode(fp, ",sipType_%C", classFTQCName(ad->u.cd)); else - prcode(fp,",sipType_QObject"); + prcode(fp,",sipType_TQObject"); if (!isArray(ad)) prcode(fp, ",NULL"); @@ -7982,8 +7982,8 @@ static void generateImportedClassAPI(classDef *cd, sipSpec *pt, moduleDef *mod, prcode(fp, "#define sipType_%C sipModuleAPI_%s_%s->em_types[%d]\n" "#define sipClass_%C sipModuleAPI_%s_%s->em_types[%d]->u.td_wrapper_type\n" - , classFQCName(cd), mname, imname, cd->iff->ifacenr - , classFQCName(cd), mname, imname, cd->iff->ifacenr); + , classFTQCName(cd), mname, imname, cd->iff->ifacenr + , classFTQCName(cd), mname, imname, cd->iff->ifacenr); if (cd->iff->type == namespace_iface) prcode(fp, @@ -8010,8 +8010,8 @@ static void generateClassAPI(classDef *cd, sipSpec *pt, FILE *fp) prcode(fp, "#define sipType_%C sipModuleAPI_%s.em_types[%d]\n" "#define sipClass_%C sipModuleAPI_%s.em_types[%d]->u.td_wrapper_type\n" - , classFQCName(cd), mname, cd->iff->ifacenr - , classFQCName(cd), mname, cd->iff->ifacenr); + , classFTQCName(cd), mname, cd->iff->ifacenr + , classFTQCName(cd), mname, cd->iff->ifacenr); generateEnumMacros(pt, cd->iff->module, cd, NULL, fp); @@ -8019,9 +8019,9 @@ static void generateClassAPI(classDef *cd, sipSpec *pt, FILE *fp) { const char *type_prefix; - if (pluginPyQt4(pt)) + if (pluginPyTQt4(pt)) type_prefix = "pyqt4"; - else if (pluginPyQt3(pt)) + else if (pluginPyTQt3(pt)) type_prefix = "pyqt3"; else type_prefix = "sip"; @@ -8107,7 +8107,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp) "class sip%C : public %S\n" "{\n" "public:\n" - ,classFQCName(cd),classFQCName(cd)); + ,classFTQCName(cd),classFTQCName(cd)); /* Define a shadow class for any protected classes we have. */ @@ -8160,7 +8160,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp) continue; prcode(fp, -" sip%C(",classFQCName(cd)); +" sip%C(",classFTQCName(cd)); generateCalledArgs(cd->iff, ct->cppsig, Declaration, TRUE, fp); @@ -8173,20 +8173,20 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp) if (!isPrivateDtor(cd)) prcode(fp, " %s~sip%C()%X;\n" - ,(cd->vmembers != NULL ? "virtual " : ""),classFQCName(cd),cd->dtorexceptions); + ,(cd->vmembers != NULL ? "virtual " : ""),classFTQCName(cd),cd->dtorexceptions); /* The metacall methods if required. */ - if (pluginPyQt4(pt) && isQObjectSubClass(cd)) + if (pluginPyTQt4(pt) && isTQObjectSubClass(cd)) { prcode(fp, "\n" -" int qt_metacall(QMetaObject::Call,int,void **);\n" +" int qt_metacall(TQMetaObject::Call,int,void **);\n" " void *qt_metacast(const char *);\n" ); - if (!noPyQt4QMetaObject(cd)) + if (!noPyTQt4TQMetaObject(cd)) prcode(fp, -" const QMetaObject *metaObject() const;\n" +" const TQMetaObject *tqmetaObject() const;\n" ); } @@ -8199,7 +8199,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp) generateProtectedDeclarations(cd,fp); /* The public wrapper around each signal emitter. */ - if (pluginPyQt3(pt)) + if (pluginPyTQt3(pt)) { visibleList *vl; @@ -8222,7 +8222,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp) prcode(fp, "\n" " /*\n" -" * There is a public method for every Qt signal that can be emitted\n" +" * There is a public method for every TQt signal that can be emitted\n" " * by this object. This function is called by Python to emit the\n" " * signal.\n" " */\n" @@ -8293,8 +8293,8 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp) "private:\n" " sip%C(const sip%C &);\n" " sip%C &operator = (const sip%C &);\n" - ,classFQCName(cd),classFQCName(cd) - ,classFQCName(cd),classFQCName(cd)); + ,classFTQCName(cd),classFTQCName(cd) + ,classFTQCName(cd),classFTQCName(cd)); if ((nrVirts = countVirtuals(cd)) > 0) prcode(fp, @@ -8641,7 +8641,7 @@ static void generateNamedBaseType(ifaceFileDef *scope, argDef *ad, char *name, case rxcon_type: case rxdis_type: nr_derefs = 1; - prcode(fp, "QObject"); + prcode(fp, TQOBJECT_OBJECT_NAME_STRING); break; case mapped_type: @@ -8915,7 +8915,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) "\n" "\n" "/* Define this type's super-types. */\n" -"static sipEncodedTypeDef supers_%C[] = {", classFQCName(cd)); +"static sipEncodedTypeDef supers_%C[] = {", classFTQCName(cd)); for (cl = cd->supers; cl != NULL; cl = cl->next) { @@ -8983,10 +8983,10 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) nr_methods = generateClassMethodTable(pt, cd, fp); nr_enums = generateEnumMemberTable(pt, mod, cd, NULL, fp); - /* Generate the PyQt4 signals table. */ + /* Generate the PyTQt4 signals table. */ is_signals = FALSE; - if (pluginPyQt4(pt) && isQObjectSubClass(cd)) + if (pluginPyTQt4(pt) && isTQObjectSubClass(cd)) { /* The signals must be grouped by name. */ for (md = cd->members; md != NULL; md = md->next) @@ -9022,9 +9022,9 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) prcode(fp, "\n" "\n" -"/* Define this type's PyQt4 signals. */\n" -"static const pyqt4QtSignal pyqt4_signals_%C[] = {\n" - , classFQCName(cd)); +"/* Define this type's PyTQt4 signals. */\n" +"static const pyqt4TQtSignal pyqt4_signals_%C[] = {\n" + , classFTQCName(cd)); } /* @@ -9132,12 +9132,12 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) has_docstring = TRUE; } - if (pluginPyQt4(pt)) + if (pluginPyTQt4(pt)) { type_prefix = "pyqt4"; embedded = TRUE; } - else if (pluginPyQt3(pt)) + else if (pluginPyTQt3(pt)) { type_prefix = "pyqt3"; embedded = TRUE; @@ -9264,52 +9264,52 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) " {"); if (is_inst_class) - prcode(fp, "typeInstances_%C, ", classFQCName(cd)); + prcode(fp, "typeInstances_%C, ", classFTQCName(cd)); else prcode(fp, "0, "); if (is_inst_voidp) - prcode(fp, "voidPtrInstances_%C, ", classFQCName(cd)); + prcode(fp, "voidPtrInstances_%C, ", classFTQCName(cd)); else prcode(fp, "0, "); if (is_inst_char) - prcode(fp, "charInstances_%C, ", classFQCName(cd)); + prcode(fp, "charInstances_%C, ", classFTQCName(cd)); else prcode(fp, "0, "); if (is_inst_string) - prcode(fp, "stringInstances_%C, ", classFQCName(cd)); + prcode(fp, "stringInstances_%C, ", classFTQCName(cd)); else prcode(fp, "0, "); if (is_inst_int) - prcode(fp, "intInstances_%C, ", classFQCName(cd)); + prcode(fp, "intInstances_%C, ", classFTQCName(cd)); else prcode(fp, "0, "); if (is_inst_long) - prcode(fp, "longInstances_%C, ", classFQCName(cd)); + prcode(fp, "longInstances_%C, ", classFTQCName(cd)); else prcode(fp, "0, "); if (is_inst_ulong) - prcode(fp, "unsignedLongInstances_%C, ", classFQCName(cd)); + prcode(fp, "unsignedLongInstances_%C, ", classFTQCName(cd)); else prcode(fp, "0, "); if (is_inst_longlong) - prcode(fp, "longLongInstances_%C, ", classFQCName(cd)); + prcode(fp, "longLongInstances_%C, ", classFTQCName(cd)); else prcode(fp,"0, "); if (is_inst_ulonglong) - prcode(fp, "unsignedLongLongInstances_%C, ", classFQCName(cd)); + prcode(fp, "unsignedLongLongInstances_%C, ", classFTQCName(cd)); else prcode(fp, "0, "); if (is_inst_double) - prcode(fp, "doubleInstances_%C", classFQCName(cd)); + prcode(fp, "doubleInstances_%C", classFTQCName(cd)); else prcode(fp, "0"); @@ -9347,7 +9347,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (cd->supers != NULL) prcode(fp, " supers_%C,\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0,\n" @@ -9374,7 +9374,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (cd->travcode != NULL) prcode(fp, " traverse_%C,\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0,\n" @@ -9383,7 +9383,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (cd->clearcode != NULL) prcode(fp, " clear_%C,\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0,\n" @@ -9396,7 +9396,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (cd->getbufcode != NULL) prcode(fp, " getbuffer_%C,\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0,\n" @@ -9405,7 +9405,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (cd->releasebufcode != NULL) prcode(fp, " releasebuffer_%C,\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0,\n" @@ -9418,7 +9418,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (cd->readbufcode != NULL) prcode(fp, " getreadbuffer_%C,\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0,\n" @@ -9427,7 +9427,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (cd->writebufcode != NULL) prcode(fp, " getwritebuffer_%C,\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0,\n" @@ -9436,7 +9436,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (cd->segcountcode != NULL) prcode(fp, " getsegcount_%C,\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0,\n" @@ -9445,7 +9445,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (cd->charbufcode != NULL) prcode(fp, " getcharbuffer_%C,\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0,\n" @@ -9514,7 +9514,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (cd->picklecode != NULL) prcode(fp, " pickle_%C\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0\n" @@ -9525,21 +9525,21 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) "},\n" ); - if (pluginPyQt3(pt)) + if (pluginPyTQt3(pt)) { if (hasSigSlots(cd)) prcode(fp, " signals_%C\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0\n" ); } - if (pluginPyQt4(pt)) + if (pluginPyTQt4(pt)) { - if (isQObjectSubClass(cd) && !noPyQt4QMetaObject(cd)) + if (isTQObjectSubClass(cd) && !noPyTQt4TQMetaObject(cd)) prcode(fp, " &%U::staticMetaObject,\n" , cd); @@ -9555,7 +9555,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) if (is_signals) prcode(fp, " pyqt4_signals_%C\n" - , classFQCName(cd)); + , classFTQCName(cd)); else prcode(fp, " 0\n" @@ -9569,7 +9569,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp) /* - * Generate an entry in the PyQt4 signal table. + * Generate an entry in the PyTQt4 signal table. */ static void generateSignalTableEntry(sipSpec *pt, classDef *cd, overDef *sig, memberDef *md, int membernr, FILE *fp) @@ -9917,7 +9917,7 @@ static void generateTypeInit(classDef *cd, moduleDef *mod, FILE *fp) if (hasShadow(cd)) prcode(fp, " sip%C *sipCpp = 0;\n" - ,classFQCName(cd)); + ,classFTQCName(cd)); else prcode(fp, " %U *sipCpp = 0;\n" @@ -10196,7 +10196,7 @@ static void generateConstructorCall(classDef *cd, ctorDef *ct, int error_flag, else if (generating_c) prcode(fp, " sipCpp = sipMalloc(sizeof (%S));\n" - ,classFQCName(cd)); + ,classFTQCName(cd)); else { int rgil = ((release_gil || isReleaseGILCtor(ct)) && !isHoldGILCtor(ct)); @@ -10210,7 +10210,7 @@ static void generateConstructorCall(classDef *cd, ctorDef *ct, int error_flag, if (hasShadow(cd)) prcode(fp, -" sipCpp = new sip%C(",classFQCName(cd)); +" sipCpp = new sip%C(",classFTQCName(cd)); else prcode(fp, " sipCpp = new %U(",cd); @@ -10796,7 +10796,7 @@ static void generateHandleResult(overDef *od, int isNew, int result_size, if (ad->atype == mapped_type) prcode(fp, ",sipType_%T,%s", ad, (isTransferredBack(ad) ? "Py_None" : "NULL")); else if (ad->atype == class_type) - prcode(fp, ",sipType_%C,%s", classFQCName(ad->u.cd), (isTransferredBack(ad) ? "Py_None" : "NULL")); + prcode(fp, ",sipType_%C,%s", classFTQCName(ad->u.cd), (isTransferredBack(ad) ? "Py_None" : "NULL")); else if (ad->atype == enum_type && ad->u.ed->fqcname != NULL) prcode(fp,",sipType_%C", ad->u.ed->fqcname); } @@ -11881,7 +11881,7 @@ static int generateArgParser(signatureDef *sd, classDef *c_scope, mappedTypeDef *mt_scope, ctorDef *ct, overDef *od, int secCall, FILE *fp) { - int a, isQtSlot, optargs, arraylenarg, sigarg, handle_self, single_arg; + int a, isTQtSlot, optargs, arraylenarg, sigarg, handle_self, single_arg; int slotconarg, slotdisarg, need_owner; ifaceFileDef *scope; @@ -11903,8 +11903,8 @@ static int generateArgParser(signatureDef *sd, classDef *c_scope, handle_self = (od != NULL && od->common->slot == no_slot && !isStatic(od) && c_scope != NULL); - /* Assume there isn't a Qt slot. */ - isQtSlot = FALSE; + /* Assume there isn't a TQt slot. */ + isTQtSlot = FALSE; /* * Generate the local variables that will hold the parsed arguments and @@ -11925,7 +11925,7 @@ static int generateArgParser(signatureDef *sd, classDef *c_scope, case rxcon_type: case rxdis_type: - isQtSlot = TRUE; + isTQtSlot = TRUE; break; case slotcon_type: @@ -11956,7 +11956,7 @@ static int generateArgParser(signatureDef *sd, classDef *c_scope, if (isProtected(od) && hasShadow(c_scope)) prcode(fp, " sip%C *sipCpp;\n" - , classFQCName(c_scope)); + , classFTQCName(c_scope)); else prcode(fp, " %U *sipCpp;\n" @@ -12037,7 +12037,7 @@ static int generateArgParser(signatureDef *sd, classDef *c_scope, if (handle_self) prcode(fp,"%c",(isReallyProtected(od) ? 'p' : 'B')); - else if (isQtSlot && od == NULL) + else if (isTQtSlot && od == NULL) prcode(fp,"C"); for (a = 0; a < sd->nrArgs; ++a) @@ -12229,7 +12229,7 @@ static int generateArgParser(signatureDef *sd, classDef *c_scope, if (ad->atype == class_type && !(generating_c || assignmentHelper(ad->u.cd))) { - fatalScopedName(classFQCName(ad->u.cd)); + fatalScopedName(classFTQCName(ad->u.cd)); fatal(" does not support /Array/\n"); } @@ -12283,8 +12283,8 @@ static int generateArgParser(signatureDef *sd, classDef *c_scope, /* Generate the parameters corresponding to the format string. */ if (handle_self) - prcode(fp,", &sipSelf, sipType_%C, &sipCpp",classFQCName(c_scope)); - else if (isQtSlot && od == NULL) + prcode(fp,", &sipSelf, sipType_%C, &sipCpp",classFTQCName(c_scope)); + else if (isTQtSlot && od == NULL) prcode(fp,", sipSelf"); for (a = 0; a < sd->nrArgs; ++a) @@ -12436,7 +12436,7 @@ static int generateArgParser(signatureDef *sd, classDef *c_scope, prcode(fp,"))\n"); - return isQtSlot; + return isTQtSlot; } @@ -13185,7 +13185,7 @@ static void prScopedClassName(FILE *fp, ifaceFileDef *scope, classDef *cd) } else { - scopedNameDef *snd = classFQCName(cd); + scopedNameDef *snd = classFTQCName(cd); while (snd != NULL) { @@ -13224,7 +13224,7 @@ static void prTypeName(FILE *fp, argDef *ad) break; case class_type: - snd = classFQCName(ad->u.cd); + snd = classFTQCName(ad->u.cd); break; default: @@ -13421,9 +13421,9 @@ static void generateClassFromVoid(classDef *cd, const char *cname, const char *vname, FILE *fp) { if (generating_c) - prcode(fp, "%S *%s = (%S *)%s", classFQCName(cd), cname, classFQCName(cd), vname); + prcode(fp, "%S *%s = (%S *)%s", classFTQCName(cd), cname, classFTQCName(cd), vname); else - prcode(fp, "%S *%s = reinterpret_cast<%S *>(%s)", classFQCName(cd), cname, classFQCName(cd), vname); + prcode(fp, "%S *%s = reinterpret_cast<%S *>(%s)", classFTQCName(cd), cname, classFTQCName(cd), vname); } diff --git a/sipgen/lexer.c b/sipgen/lexer.c index 06309e1..74ed026 100644 --- a/sipgen/lexer.c +++ b/sipgen/lexer.c @@ -1836,7 +1836,7 @@ YY_RULE_SETUP case 72: YY_RULE_SETUP #line 133 "/home/phil/hg/sip/sip-4.10.5/sipgen/lexer.l" -{return TK_QOBJECT;} +{return TK_TQOBJECT;} YY_BREAK case 73: YY_RULE_SETUP @@ -1947,7 +1947,7 @@ YY_RULE_SETUP yylval.qchar = yytext[1]; - return TK_QCHAR; + return TK_TQCHAR; } YY_BREAK case 84: diff --git a/sipgen/lexer.l b/sipgen/lexer.l index 35fb9c2..5c0c96b 100644 --- a/sipgen/lexer.l +++ b/sipgen/lexer.l @@ -84,10 +84,10 @@ struct {return TK_STRUCT;} public {return TK_PUBLIC;} protected {return TK_PROTECTED;} private {return TK_PRIVATE;} -signals {return TK_SIGNALS;} +Q_SIGNALS {return TK_SIGNALS;} Q_SIGNALS {return TK_SIGNALS;} Q_SIGNAL {return TK_SIGNAL_METHOD;} -slots {return TK_SLOTS;} +Q_SLOTS {return TK_SLOTS;} Q_SLOTS {return TK_SLOTS;} Q_SLOT {return TK_SLOT_METHOD;} char {return TK_CHAR;} diff --git a/sipgen/main.c b/sipgen/main.c index 4cf81f1..199fab1 100644 --- a/sipgen/main.c +++ b/sipgen/main.c @@ -480,7 +480,7 @@ static void help(void) "where:\n" " -h display this help message\n" " -V display the %s version number\n" -" -a file the name of the QScintilla API file [default not generated]\n" +" -a file the name of the TQScintilla API file [default not generated]\n" " -b file the name of the build file [default none generated]\n" " -c dir the name of the code directory [default not generated]\n" " -d file the name of the documentation file [default not generated]\n" diff --git a/sipgen/parser.c b/sipgen/parser.c index 5c51d1d..cf30191 100644 --- a/sipgen/parser.c +++ b/sipgen/parser.c @@ -93,8 +93,8 @@ static int sectionFlags; /* The current section flags. */ static int currentOverIsVirt; /* Set if the overload is virtual. */ static int currentCtorIsExplicit; /* Set if the ctor is explicit. */ static int currentIsStatic; /* Set if the current is static. */ -static int currentIsSignal; /* Set if the current is Q_SIGNAL. */ -static int currentIsSlot; /* Set if the current is Q_SLOT. */ +static int currentIsSignal; /* Set if the current is TQ_SIGNAL. */ +static int currentIsSlot; /* Set if the current is TQ_SLOT. */ static int currentIsTemplate; /* Set if the current is a template. */ static char *previousFile; /* The file just parsed. */ static parserContext currentContext; /* The current context. */ @@ -307,9 +307,9 @@ static int isEnabledFeature(const char *name); TK_LOGICAL_OR = 337, TK_CONST = 338, TK_STATIC = 339, - TK_SIPSIGNAL = 340, - TK_SIPSLOT = 341, - TK_SIPANYSLOT = 342, + TK_SIPTQT_SIGNAL = 340, + TK_SIPTQT_SLOT = 341, + TK_SIPANYTQT_SLOT = 342, TK_SIPRXCON = 343, TK_SIPRXDIS = 344, TK_SIPSLOTCON = 345, @@ -322,13 +322,13 @@ static int isEnabledFeature(const char *name); TK_PLATFORMS = 352, TK_FEATURE = 353, TK_LICENSE = 354, - TK_QCHAR = 355, + TK_TQCHAR = 355, TK_TRUE = 356, TK_FALSE = 357, TK_NULL = 358, TK_OPERATOR = 359, TK_THROW = 360, - TK_QOBJECT = 361, + TK_TQOBJECT = 361, TK_EXCEPTION = 362, TK_RAISECODE = 363, TK_EXPLICIT = 364, @@ -421,9 +421,9 @@ static int isEnabledFeature(const char *name); #define TK_LOGICAL_OR 337 #define TK_CONST 338 #define TK_STATIC 339 -#define TK_SIPSIGNAL 340 -#define TK_SIPSLOT 341 -#define TK_SIPANYSLOT 342 +#define TK_SIPTQT_SIGNAL 340 +#define TK_SIPTQT_SLOT 341 +#define TK_SIPANYTQT_SLOT 342 #define TK_SIPRXCON 343 #define TK_SIPRXDIS 344 #define TK_SIPSLOTCON 345 @@ -436,13 +436,13 @@ static int isEnabledFeature(const char *name); #define TK_PLATFORMS 352 #define TK_FEATURE 353 #define TK_LICENSE 354 -#define TK_QCHAR 355 +#define TK_TQCHAR 355 #define TK_TRUE 356 #define TK_FALSE 357 #define TK_NULL 358 #define TK_OPERATOR 359 #define TK_THROW 360 -#define TK_QOBJECT 361 +#define TK_TQOBJECT 361 #define TK_EXCEPTION 362 #define TK_RAISECODE 363 #define TK_EXPLICIT 364 @@ -997,8 +997,8 @@ static const char *const yytname[] = "TK_STATIC", "TK_SIPSIGNAL", "TK_SIPSLOT", "TK_SIPANYSLOT", "TK_SIPRXCON", "TK_SIPRXDIS", "TK_SIPSLOTCON", "TK_SIPSLOTDIS", "TK_NUMBER", "TK_REAL", "TK_TYPEDEF", "TK_NAMESPACE", "TK_TIMELINE", - "TK_PLATFORMS", "TK_FEATURE", "TK_LICENSE", "TK_QCHAR", "TK_TRUE", - "TK_FALSE", "TK_NULL", "TK_OPERATOR", "TK_THROW", "TK_QOBJECT", + "TK_PLATFORMS", "TK_FEATURE", "TK_LICENSE", "TK_TQCHAR", "TK_TRUE", + "TK_FALSE", "TK_NULL", "TK_OPERATOR", "TK_THROW", "TK_TQOBJECT", "TK_EXCEPTION", "TK_RAISECODE", "TK_EXPLICIT", "TK_TEMPLATE", "TK_ELLIPSIS", "TK_DEFMETATYPE", "TK_DEFSUPERTYPE", "'{'", "'}'", "';'", "'('", "')'", "'!'", "'-'", "','", "'='", "'+'", "'*'", "'/'", "'&'", @@ -3530,7 +3530,7 @@ yyreduce: /* * This is a no-op and is retained for compatibility * until the last use of it (by SIP v3) can be removed - * from PyQt. + * from PyTQt. */ } break; @@ -6851,11 +6851,11 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd, if ((flg = findOptFlag(of, "Supertype", dotted_name_flag)) != NULL) cd->supertype = cacheName(pt, flg->fvalue.sval); - if ((flg = findOptFlag(of, "PyQt4Flags", integer_flag)) != NULL) + if ((flg = findOptFlag(of, "PyTQt4Flags", integer_flag)) != NULL) cd->pyqt4_flags = flg->fvalue.ival; - if (findOptFlag(of, "PyQt4NoQMetaObject", bool_flag) != NULL) - setPyQt4NoQMetaObject(cd); + if (findOptFlag(of, "PyTQt4NoTQMetaObject", bool_flag) != NULL) + setPyTQt4NoTQMetaObject(cd); if (isOpaque(cd)) { @@ -7548,7 +7548,7 @@ static void instantiateClassTemplate(sipSpec *pt, moduleDef *mod, ifaceFileList *iffl, **used; type_names = type_values = NULL; - appendTypeStrings(classFQCName(tcd->cd), &tcd->sig, &td->types, NULL, &type_names, &type_values); + appendTypeStrings(classFTQCName(tcd->cd), &tcd->sig, &td->types, NULL, &type_names, &type_values); /* * Add a mapping from the template name to the instantiated name. If we @@ -7557,9 +7557,9 @@ static void instantiateClassTemplate(sipSpec *pt, moduleDef *mod, ad = &tcd->sig.args[tcd->sig.nrArgs++]; memset(ad, 0, sizeof (argDef)); ad->atype = defined_type; - ad->u.snd = classFQCName(tcd->cd); + ad->u.snd = classFTQCName(tcd->cd); - appendScopedName(&type_names, text2scopePart(scopedNameTail(classFQCName(tcd->cd)))); + appendScopedName(&type_names, text2scopePart(scopedNameTail(classFTQCName(tcd->cd)))); appendScopedName(&type_values, text2scopePart(scopedNameToString(fqname))); /* Create the new class. */ @@ -7949,7 +7949,7 @@ static void templateType(argDef *ad, classTmplDef *tcd, templateDef *td, classDe } /* Handle the class name itself. */ - if (strcmp(name, scopedNameTail(classFQCName(tcd->cd))) == 0) + if (strcmp(name, scopedNameTail(classFTQCName(tcd->cd))) == 0) { ad->atype = class_type; ad->u.cd = ncd; @@ -8174,7 +8174,7 @@ static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name) scopedNameDef *snd; int found; - snd = copyScopedName(classFQCName(scope)); + snd = copyScopedName(classFTQCName(scope)); appendScopedName(&snd, copyScopedName(rel_name)); found = (compareScopedNames(fq_name, snd) == 0); @@ -8594,7 +8594,7 @@ static void newFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope, if (isvirt) { - if (isSignal(od) && pluginPyQt3(pt)) + if (isSignal(od) && pluginPyTQt3(pt)) yyerror("Virtual signals aren't supported"); setIsVirtual(od); @@ -8821,7 +8821,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope, int nrargs; /* Nr. of arguments. */ } slot_table[] = { {"__str__", str_slot, TRUE, 0}, - {"__unicode__", unicode_slot, TRUE, 0}, + {"__tqunicode__", tqunicode_slot, TRUE, 0}, {"__int__", int_slot, FALSE, 0}, {"__long__", long_slot, FALSE, 0}, {"__float__", float_slot, FALSE, 0}, @@ -9649,20 +9649,20 @@ static const char *getDocValue(optFlags *optflgs) /* - * Return TRUE if the PyQt3 plugin was specified. + * Return TRUE if the PyTQt3 plugin was specified. */ -int pluginPyQt3(sipSpec *pt) +int pluginPyTQt3(sipSpec *pt) { - return stringFind(pt->plugins, "PyQt3"); + return stringFind(pt->plugins, "PyTQt3"); } /* - * Return TRUE if the PyQt4 plugin was specified. + * Return TRUE if the PyTQt4 plugin was specified. */ -int pluginPyQt4(sipSpec *pt) +int pluginPyTQt4(sipSpec *pt) { - return stringFind(pt->plugins, "PyQt4"); + return stringFind(pt->plugins, "PyTQt4"); } diff --git a/sipgen/parser.h b/sipgen/parser.h index 1d3c05a..2f87559 100644 --- a/sipgen/parser.h +++ b/sipgen/parser.h @@ -121,9 +121,9 @@ TK_LOGICAL_OR = 337, TK_CONST = 338, TK_STATIC = 339, - TK_SIPSIGNAL = 340, - TK_SIPSLOT = 341, - TK_SIPANYSLOT = 342, + TK_SIPTQT_SIGNAL = 340, + TK_SIPTQT_SLOT = 341, + TK_SIPANYTQT_SLOT = 342, TK_SIPRXCON = 343, TK_SIPRXDIS = 344, TK_SIPSLOTCON = 345, @@ -136,13 +136,13 @@ TK_PLATFORMS = 352, TK_FEATURE = 353, TK_LICENSE = 354, - TK_QCHAR = 355, + TK_TQCHAR = 355, TK_TRUE = 356, TK_FALSE = 357, TK_NULL = 358, TK_OPERATOR = 359, TK_THROW = 360, - TK_QOBJECT = 361, + TK_TQOBJECT = 361, TK_EXCEPTION = 362, TK_RAISECODE = 363, TK_EXPLICIT = 364, @@ -235,9 +235,9 @@ #define TK_LOGICAL_OR 337 #define TK_CONST 338 #define TK_STATIC 339 -#define TK_SIPSIGNAL 340 -#define TK_SIPSLOT 341 -#define TK_SIPANYSLOT 342 +#define TK_SIPTQT_SIGNAL 340 +#define TK_SIPTQT_SLOT 341 +#define TK_SIPANYTQT_SLOT 342 #define TK_SIPRXCON 343 #define TK_SIPRXDIS 344 #define TK_SIPSLOTCON 345 @@ -250,13 +250,13 @@ #define TK_PLATFORMS 352 #define TK_FEATURE 353 #define TK_LICENSE 354 -#define TK_QCHAR 355 +#define TK_TQCHAR 355 #define TK_TRUE 356 #define TK_FALSE 357 #define TK_NULL 358 #define TK_OPERATOR 359 #define TK_THROW 360 -#define TK_QOBJECT 361 +#define TK_TQOBJECT 361 #define TK_EXCEPTION 362 #define TK_RAISECODE 363 #define TK_EXPLICIT 364 diff --git a/sipgen/parser.y b/sipgen/parser.y index 4000e7d..08521e8 100644 --- a/sipgen/parser.y +++ b/sipgen/parser.y @@ -1772,7 +1772,7 @@ classline: ifstart } | TK_SIGNALS ':' { if (currentSpec -> genc) - yyerror("signals section not allowed in a C module"); + yyerror("Q_SIGNALS section not allowed in a C module"); if (notSkipping()) sectionFlags = SECT_IS_SIGNAL; @@ -2288,7 +2288,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign { $$.name = cacheName(currentSpec, $2); $$.defval = $4; - currentSpec -> sigslots = TRUE; + currentSpec -> sigQ_SLOTS = TRUE; } | TK_SIPSLOT optname optflags optassign { $$.atype = slot_type; @@ -2297,7 +2297,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign { $$.name = cacheName(currentSpec, $2); $$.defval = $4; - currentSpec -> sigslots = TRUE; + currentSpec -> sigQ_SLOTS = TRUE; } | TK_SIPANYSLOT optname optflags optassign { $$.atype = anyslot_type; @@ -2306,7 +2306,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign { $$.name = cacheName(currentSpec, $2); $$.defval = $4; - currentSpec -> sigslots = TRUE; + currentSpec -> sigQ_SLOTS = TRUE; } | TK_SIPRXCON optname optflags { $$.atype = rxcon_type; @@ -2317,7 +2317,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign { if (findOptFlag(&$3, "SingleShot", bool_flag) != NULL) $$.argflags |= ARG_SINGLE_SHOT; - currentSpec -> sigslots = TRUE; + currentSpec -> sigQ_SLOTS = TRUE; } | TK_SIPRXDIS optname optflags { $$.atype = rxdis_type; @@ -2325,7 +2325,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign { $$.nrderefs = 0; $$.name = cacheName(currentSpec, $2); - currentSpec -> sigslots = TRUE; + currentSpec -> sigQ_SLOTS = TRUE; } | TK_SIPSLOTCON '(' arglist ')' optname optflags { $$.atype = slotcon_type; @@ -2339,7 +2339,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign { $$.u.sa = sipMalloc(sizeof (signatureDef)); *$$.u.sa = $3; - currentSpec -> sigslots = TRUE; + currentSpec -> sigQ_SLOTS = TRUE; } | TK_SIPSLOTDIS '(' arglist ')' optname optflags { $$.atype = slotdis_type; @@ -2353,7 +2353,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign { $$.u.sa = sipMalloc(sizeof (signatureDef)); *$$.u.sa = $3; - currentSpec -> sigslots = TRUE; + currentSpec -> sigQ_SLOTS = TRUE; } | TK_QOBJECT optname optflags { $$.atype = qobject_type; @@ -2750,7 +2750,7 @@ void parse(sipSpec *spec, FILE *fp, char *filename, stringList *tsl, spec->typedefs = NULL; spec->exphdrcode = NULL; spec->docs = NULL; - spec->sigslots = FALSE; + spec->sigQ_SLOTS = FALSE; spec->genc = -1; spec->plugins = NULL; @@ -3666,7 +3666,7 @@ static enumDef *newEnum(sipSpec *pt, moduleDef *mod, mappedTypeDef *mt_scope, ed->next_alt = next_alt; ed->module = mod; ed->members = NULL; - ed->slots = NULL; + ed->Q_SLOTS = NULL; ed->overs = NULL; ed->next = pt -> enums; @@ -4249,9 +4249,9 @@ static void instantiateTemplateEnums(sipSpec *pt, classTmplDef *tcd, ed->members = emd; } - ed->slots = instantiateTemplateMethods(ted->slots, mod); + ed->Q_SLOTS = instantiateTemplateMethods(ted->Q_SLOTS, mod); ed->overs = instantiateTemplateOverloads(pt, ted->overs, - ted->slots, ed->slots, tcd, td, cd, used, type_names, + ted->Q_SLOTS, ed->Q_SLOTS, tcd, td, cd, used, type_names, type_values); ed->next = pt->enums; @@ -4969,16 +4969,16 @@ static void newFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope, if (isSignal(od)) setHasShadow(c_scope); - pt->sigslots = TRUE; + pt->sigQ_SLOTS = TRUE; } if (isSignal(od) && (methodcode != NULL || vcode != NULL)) - yyerror("Cannot provide code for signals"); + yyerror("Cannot provide code for Q_SIGNALS"); if (isstatic) { if (isSignal(od)) - yyerror("Static functions cannot be signals"); + yyerror("Static functions cannot be Q_SIGNALS"); if (isvirt) yyerror("Static functions cannot be virtual"); @@ -5006,7 +5006,7 @@ static void newFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope, if (isvirt) { if (isSignal(od) && pluginPyQt3(pt)) - yyerror("Virtual signals aren't supported"); + yyerror("Virtual Q_SIGNALS aren't supported"); setIsVirtual(od); setHasShadow(c_scope); @@ -5232,7 +5232,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope, int nrargs; /* Nr. of arguments. */ } slot_table[] = { {"__str__", str_slot, TRUE, 0}, - {"__unicode__", unicode_slot, TRUE, 0}, + {"__tqunicode__", tqunicode_slot, TRUE, 0}, {"__int__", int_slot, FALSE, 0}, {"__long__", long_slot, FALSE, 0}, {"__float__", float_slot, FALSE, 0}, diff --git a/sipgen/sip.h b/sipgen/sip.h index 624a1ee..10076a6 100644 --- a/sipgen/sip.h +++ b/sipgen/sip.h @@ -44,7 +44,7 @@ /* For convenience. */ #define classBaseName(cd) scopedNameTail((cd)->iff->fqcname) -#define classFQCName(cd) ((cd)->iff->fqcname) +#define classFTQCName(cd) ((cd)->iff->fqcname) /* Handle module flags. */ @@ -90,10 +90,10 @@ #define CLASS_IS_EXTERNAL 0x00080000 /* It is external. */ #define CLASS_IS_DELAYED_DTOR 0x00100000 /* The dtor is delayed. */ #define CLASS_NO_DEFAULT_CTORS 0x00200000 /* Don't create default ctors. */ -#define CLASS_QOBJECT_SUB 0x00400000 /* It is derived from QObject. */ +#define CLASS_TQOBJECT_SUB 0x00400000 /* It is derived from TQObject. */ #define CLASS_DTOR_HOLD_GIL 0x00800000 /* The dtor holds the GIL. */ #define CLASS_ASSIGN_HELPER 0x01000000 /* Generate an assignment helper. */ -#define CLASS_NO_QMETAOBJECT 0x02000000 /* It has no QMetaObject. */ +#define CLASS_NO_TQMETAOBJECT 0x02000000 /* It has no TQMetaObject. */ #define CLASS_IS_TEMPLATE 0x04000000 /* It is a template class. */ #define CLASS_IS_DEPRECATED 0x08000000 /* It is deprecated. */ #define CLASS_CANNOT_COPY 0x10000000 /* It cannot be copied. */ @@ -130,14 +130,14 @@ #define setIsDelayedDtor(cd) ((cd)->classflags |= CLASS_IS_DELAYED_DTOR) #define noDefaultCtors(cd) ((cd)->classflags & CLASS_NO_DEFAULT_CTORS) #define setNoDefaultCtors(cd) ((cd)->classflags |= CLASS_NO_DEFAULT_CTORS) -#define isQObjectSubClass(cd) ((cd)->classflags & CLASS_QOBJECT_SUB) -#define setIsQObjectSubClass(cd) ((cd)->classflags |= CLASS_QOBJECT_SUB) +#define isTQObjectSubClass(cd) ((cd)->classflags & CLASS_TQOBJECT_SUB) +#define setIsTQObjectSubClass(cd) ((cd)->classflags |= CLASS_TQOBJECT_SUB) #define isHoldGILDtor(cd) ((cd)->classflags & CLASS_DTOR_HOLD_GIL) #define setIsHoldGILDtor(cd) ((cd)->classflags |= CLASS_DTOR_HOLD_GIL) #define assignmentHelper(cd) ((cd)->classflags & CLASS_ASSIGN_HELPER) #define setAssignmentHelper(cd) ((cd)->classflags |= CLASS_ASSIGN_HELPER) -#define noPyQt4QMetaObject(cd) ((cd)->classflags & CLASS_NO_QMETAOBJECT) -#define setPyQt4NoQMetaObject(cd) ((cd)->classflags |= CLASS_NO_QMETAOBJECT) +#define noPyTQt4TQMetaObject(cd) ((cd)->classflags & CLASS_NO_TQMETAOBJECT) +#define setPyTQt4NoTQMetaObject(cd) ((cd)->classflags |= CLASS_NO_TQMETAOBJECT) #define isTemplateClass(cd) ((cd)->classflags & CLASS_IS_TEMPLATE) #define setIsTemplateClass(cd) ((cd)->classflags |= CLASS_IS_TEMPLATE) #define resetIsTemplateClass(cd) ((cd)->classflags &= ~CLASS_IS_TEMPLATE) @@ -425,7 +425,7 @@ typedef enum { str_slot, - unicode_slot, + tqunicode_slot, int_slot, long_slot, float_slot, @@ -722,7 +722,7 @@ typedef struct _moduleDef { apiVersionRangeDef *api_versions; /* The defined APIs. */ apiVersionRangeDef *api_ranges; /* The list of API version ranges. */ int modflags; /* The module flags. */ - int qobjclass; /* QObject class, -1 if none. */ + int qobjclass; /* TQObject class, -1 if none. */ struct _memberDef *othfuncs; /* List of other functions. */ struct _overDef *overs; /* Global overloads. */ argType encoding; /* The default string encoding. */ @@ -988,7 +988,7 @@ typedef struct _mroDef { typedef struct _classDef { int classflags; /* The class flags. */ - int pyqt4_flags; /* The PyQt4 specific flags. */ + int pyqt4_flags; /* The PyTQt4 specific flags. */ nameDef *pyname; /* The Python name. */ ifaceFileDef *iff; /* The interface file. */ struct _classDef *ecd; /* The enclosing scope. */ @@ -1138,8 +1138,8 @@ codeBlock *templateCode(sipSpec *pt, ifaceFileList **used, codeBlock *ocb, scope ifaceFileDef *findIfaceFile(sipSpec *pt, moduleDef *mod, scopedNameDef *fqname, ifaceFileType iftype, apiVersionRangeDef *api_range, argDef *ad); -int pluginPyQt3(sipSpec *pt); -int pluginPyQt4(sipSpec *pt); +int pluginPyTQt3(sipSpec *pt); +int pluginPyTQt4(sipSpec *pt); void yywarning(char *); nameDef *cacheName(sipSpec *pt, const char *name); scopedNameDef *encodedTemplateName(templateDef *td); diff --git a/sipgen/transform.c b/sipgen/transform.c index d24260f..8e61351 100644 --- a/sipgen/transform.c +++ b/sipgen/transform.c @@ -118,11 +118,11 @@ void transform(sipSpec *pt) rev = cd; /* - * Mark any QObject class. This flag will ripple through all derived + * Mark any TQObject class. This flag will ripple through all derived * classes when we set the hierarchy. */ - if (strcmp(classBaseName(cd), "QObject") == 0) - setIsQObjectSubClass(cd); + if (strcmp(classBaseName(cd), TQOBJECT_OBJECT_NAME_STRING) == 0) + setIsTQObjectSubClass(cd); cd = next; } @@ -168,7 +168,7 @@ void transform(sipSpec *pt) for (cd = pt -> classes; cd != NULL; cd = cd -> next) if (cd -> iff -> module == NULL) { - fatalScopedName(classFQCName(cd)); + fatalScopedName(classFTQCName(cd)); fatal(" has not been defined\n"); } @@ -494,7 +494,7 @@ static void checkAssignmentHelper(sipSpec *pt, classDef *cd) ctorDef *ct; /* - * We register types with Qt if the class is not abstract, doesn't have a + * We register types with TQt if the class is not abstract, doesn't have a * private assignment operator, has a public default ctor, a public copy * ctor and a public dtor. */ @@ -672,11 +672,11 @@ static void moveClassCasts(sipSpec *pt, moduleDef *mod, classDef *cd) if (sameSignature(&(*ctp)->pysig, &ct->pysig, FALSE)) { fatal("operator "); - fatalScopedName(classFQCName(dcd)); + fatalScopedName(classFTQCName(dcd)); fatal("::"); - fatalScopedName(classFQCName(dcd)); + fatalScopedName(classFTQCName(dcd)); fatal("("); - fatalScopedName(classFQCName(cd)); + fatalScopedName(classFTQCName(cd)); fatal(") already defined\n"); } @@ -902,7 +902,7 @@ static void moveGlobalSlot(sipSpec *pt, moduleDef *mod, memberDef *gmd) /* * Return an alternative class implementation of a mapped type if there is * one. Note that we cheat as we assume there is one going to be one (as - * there will be in PyQt at the moment). + * there will be in PyTQt at the moment). */ static classDef *findAltClassImplementation(sipSpec *pt, mappedTypeDef *mtd) { @@ -1083,7 +1083,7 @@ static void filterModuleVirtualHandlers(moduleDef *mod) /* - * Add an overload that is automatically generated (typically by Qt's moc). + * Add an overload that is automatically generated (typically by TQt's tqmoc). */ static void addAutoOverload(sipSpec *pt,classDef *autocd,overDef *autood) { @@ -1180,9 +1180,9 @@ static void setHierarchy(sipSpec *pt, classDef *base, classDef *cd, if (cl->cd->mro != NULL && hierBeingSet(cl->cd->mro)) { fatal("Recursive class hierarchy detected: "); - fatalScopedName(classFQCName(cd)); + fatalScopedName(classFTQCName(cd)); fatal(" and "); - fatalScopedName(classFQCName(cl->cd)); + fatalScopedName(classFTQCName(cl->cd)); fatal("\n"); } @@ -1198,11 +1198,11 @@ static void setHierarchy(sipSpec *pt, classDef *base, classDef *cd, setIsDeprecatedClass(cd); /* - * If the super-class is a QObject sub-class then this one is + * If the super-class is a TQObject sub-class then this one is * as well. */ - if (isQObjectSubClass(mro->cd)) - setIsQObjectSubClass(cd); + if (isTQObjectSubClass(mro->cd)) + setIsTQObjectSubClass(cd); /* * If the super-class can't be assigned to then this one @@ -1380,7 +1380,7 @@ static void transformCtors(sipSpec *pt, classDef *cd) for (prev = cd->ctors; prev != ct; prev = prev->next) if (samePythonSignature(&prev->pysig, &ct->pysig)) { - fatalScopedName(classFQCName(cd)); + fatalScopedName(classFTQCName(cd)); fatal(" has ctors with the same Python signature\n"); } @@ -1412,7 +1412,7 @@ static void transformCasts(sipSpec *pt, classDef *cd) if (dcd == NULL) { - fatalScopedName(classFQCName(cd)); + fatalScopedName(classFTQCName(cd)); fatal(" operator cast must be to a class\n"); } } @@ -1632,7 +1632,7 @@ static void getVisibleMembers(sipSpec *pt, classDef *cd) if (!generatingCodeForModule(pt, cd->iff->module)) continue; - if (isProtected(od) || (isSignal(od) && pluginPyQt3(pt))) + if (isProtected(od) || (isSignal(od) && pluginPyTQt3(pt))) setIsUsedName(md->pyname); /* Make we have any API name. */ @@ -1835,7 +1835,7 @@ static void resolveCtorTypes(sipSpec *pt,classDef *scope,ctorDef *ct) if (!supportedType(scope,NULL,ad,FALSE) && (ct -> cppsig == &ct -> pysig || ct -> methodcode == NULL)) { - fatalScopedName(classFQCName(scope)); + fatalScopedName(classFTQCName(scope)); fatal(" unsupported ctor argument type - provide %%MethodCode and a C++ signature\n"); } @@ -1911,7 +1911,7 @@ static void resolvePySigTypes(sipSpec *pt, moduleDef *mod, classDef *scope, { if (scope != NULL) { - fatalScopedName(classFQCName(scope)); + fatalScopedName(classFTQCName(scope)); fatal("::"); } @@ -1925,7 +1925,7 @@ static void resolvePySigTypes(sipSpec *pt, moduleDef *mod, classDef *scope, { if (scope != NULL) { - fatalScopedName(classFQCName(scope)); + fatalScopedName(classFTQCName(scope)); fatal("::"); } @@ -1952,7 +1952,7 @@ static void resolvePySigTypes(sipSpec *pt, moduleDef *mod, classDef *scope, { if (scope != NULL) { - fatalScopedName(classFQCName(scope)); + fatalScopedName(classFTQCName(scope)); fatal("::"); } @@ -1963,7 +1963,7 @@ static void resolvePySigTypes(sipSpec *pt, moduleDef *mod, classDef *scope, { if (scope != NULL) { - fatalScopedName(classFQCName(scope)); + fatalScopedName(classFTQCName(scope)); fatal("::"); } @@ -2265,7 +2265,7 @@ static void ensureInput(classDef *cd,overDef *od,argDef *ad) { if (cd != NULL) { - fatalScopedName(classFQCName(cd)); + fatalScopedName(classFTQCName(cd)); fatal("::"); } @@ -2995,7 +2995,7 @@ static void searchClassScope(sipSpec *pt, classDef *c_scope, continue; /* Append the name to the scope and see if it exists. */ - tmpsnd = copyScopedName(classFQCName(mro->cd)); + tmpsnd = copyScopedName(classFTQCName(mro->cd)); appendScopedName(&tmpsnd, copyScopedName(snd)); searchMappedTypes(pt, mro->cd->iff->module, tmpsnd, ad); @@ -3155,7 +3155,7 @@ static void searchClasses(sipSpec *pt, moduleDef *context, if (isExternal(cd) && cd->iff->module != context) continue; - if (compareScopedNames(classFQCName(cd), cname) == 0) + if (compareScopedNames(classFTQCName(cd), cname) == 0) { ad->atype = class_type; ad->u.cd = cd; @@ -3404,8 +3404,8 @@ static void createSortedNumberedTypesTable(sipSpec *pt, moduleDef *mod) case class_type: ad->u.cd->iff->ifacenr = i; - /* If we find a class called QObject, assume it's Qt. */ - if (strcmp(ad->name->text, "QObject") == 0) + /* If we find a class called TQObject, assume it's TQt. */ + if (strcmp(ad->name->text, TQOBJECT_OBJECT_NAME_STRING) == 0) mod->qobjclass = i; break; diff --git a/siplib/qtlib.c b/siplib/qtlib.c index ca0817a..88432b7 100644 --- a/siplib/qtlib.c +++ b/siplib/qtlib.c @@ -1,6 +1,6 @@ /* * The SIP library code that implements the interface to the optional module - * supplied Qt support. + * supplied TQt support. * * Copyright (c) 2010 Riverbank Computing Limited <info@riverbankcomputing.com> * @@ -26,9 +26,9 @@ #include "sipint.h" -/* This is how Qt "types" signals and slots. */ -#define isQtSlot(s) (*(s) == '1') -#define isQtSignal(s) (*(s) == '2') +/* This is how TQt "types" signals and slots. */ +#define isTQtSlot(s) (*(s) == '1') +#define isTQtSignal(s) (*(s) == '2') static PyObject *getWeakRef(PyObject *obj); @@ -44,8 +44,8 @@ static void *newSignal(void *txrx, const char **sig); */ static void *findSignal(void *txrx, const char **sig) { - if (sipQtSupport->qt_find_universal_signal != NULL) - txrx = sipQtSupport->qt_find_universal_signal(txrx, sig); + if (sipTQtSupport->qt_find_universal_signal != NULL) + txrx = sipTQtSupport->qt_find_universal_signal(txrx, sig); return txrx; } @@ -58,8 +58,8 @@ static void *newSignal(void *txrx, const char **sig) { void *new_txrx = findSignal(txrx, sig); - if (new_txrx == NULL && sipQtSupport->qt_create_universal_signal != NULL) - new_txrx = sipQtSupport->qt_create_universal_signal(txrx, sig); + if (new_txrx == NULL && sipTQtSupport->qt_create_universal_signal != NULL) + new_txrx = sipTQtSupport->qt_create_universal_signal(txrx, sig); return new_txrx; } @@ -72,7 +72,7 @@ static void *newSignal(void *txrx, const char **sig) static void *createUniversalSlot(sipWrapper *txSelf, const char *sig, PyObject *rxObj, const char *slot, const char **member, int flags) { - void *us = sipQtSupport->qt_create_universal_slot(txSelf, sig, rxObj, slot, + void *us = sipTQtSupport->qt_create_universal_slot(txSelf, sig, rxObj, slot, member, flags); if (us && txSelf) @@ -83,7 +83,7 @@ static void *createUniversalSlot(sipWrapper *txSelf, const char *sig, /* - * Invoke a single slot (Qt or Python) and return the result. + * Invoke a single slot (TQt or Python) and return the result. */ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) { @@ -92,12 +92,12 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) /* Keep some compilers quiet. */ oxtype = oxvalue = oxtb = NULL; - /* Fan out Qt signals. (Only PyQt3 will do this.) */ + /* Fan out TQt signals. (Only PyTQt3 will do this.) */ if (slot->name != NULL && slot->name[0] != '\0') { - assert(sipQtSupport->qt_emit_signal); + assert(sipTQtSupport->qt_emit_signal); - if (sipQtSupport->qt_emit_signal(slot->pyobj, slot->name, sigargs) < 0) + if (sipTQtSupport->qt_emit_signal(slot->pyobj, slot->name, sigargs) < 0) return NULL; Py_INCREF(Py_None); @@ -125,7 +125,7 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) { /* * If the real object has gone then we pretend everything is Ok. This - * mimics the Qt behaviour of not caring if a receiving object has been + * mimics the TQt behaviour of not caring if a receiving object has been * deleted. */ Py_DECREF(sref); @@ -191,7 +191,7 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) * We make repeated attempts to call a slot. If we work out that it failed * because of an immediate type error we try again with one less argument. * We keep going until we run out of arguments to drop. This emulates the - * Qt ability of the slot to accept fewer arguments than a signal provides. + * TQt ability of the slot to accept fewer arguments than a signal provides. */ sa = sigargs; Py_INCREF(sa); @@ -307,13 +307,13 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs) */ int sip_api_same_slot(const sipSlot *sp, PyObject *rxObj, const char *slot) { - /* See if they are signals or Qt slots, ie. they have a name. */ + /* See if they are signals or TQt slots, ie. they have a name. */ if (slot != NULL) { if (sp->name == NULL || sp->name[0] == '\0') return 0; - return (sipQtSupport->qt_same_name(sp->name, slot) && sp->pyobj == rxObj); + return (sipTQtSupport->qt_same_name(sp->name, slot) && sp->pyobj == rxObj); } /* See if they are pure Python methods. */ @@ -352,32 +352,32 @@ void *sipGetRx(sipSimpleWrapper *txSelf, const char *sigargs, PyObject *rxObj, const char *slot, const char **memberp) { if (slot != NULL) - if (isQtSlot(slot) || isQtSignal(slot)) + if (isTQtSlot(slot) || isTQtSignal(slot)) { void *rx; *memberp = slot; - if ((rx = sip_api_get_cpp_ptr((sipSimpleWrapper *)rxObj, sipQObjectType)) == NULL) + if ((rx = sip_api_get_cpp_ptr((sipSimpleWrapper *)rxObj, sipTQObjectType)) == NULL) return NULL; - if (isQtSignal(slot)) + if (isTQtSignal(slot)) rx = findSignal(rx, memberp); return rx; } /* - * The slot was either a Python callable or PyQt3 Python signal so there + * The slot was either a Python callable or PyTQt3 Python signal so there * should be a universal slot. */ - return sipQtSupport->qt_find_slot(sipGetAddress(txSelf), sigargs, rxObj, slot, memberp); + return sipTQtSupport->qt_find_slot(sipGetAddress(txSelf), sigargs, rxObj, slot, memberp); } /* - * Convert a Python receiver (either a Python signal or slot or a Qt signal or - * slot) to a Qt receiver. It is only ever called when the signal is a Qt + * Convert a Python receiver (either a Python signal or slot or a TQt signal or + * slot) to a TQt receiver. It is only ever called when the signal is a TQt * signal. Return NULL is there was an error. */ void *sip_api_convert_rx(sipWrapper *txSelf, const char *sigargs, @@ -386,16 +386,16 @@ void *sip_api_convert_rx(sipWrapper *txSelf, const char *sigargs, if (slot == NULL) return createUniversalSlot(txSelf, sigargs, rxObj, NULL, memberp, flags); - if (isQtSlot(slot) || isQtSignal(slot)) + if (isTQtSlot(slot) || isTQtSignal(slot)) { void *rx; *memberp = slot; - if ((rx = sip_api_get_cpp_ptr((sipSimpleWrapper *)rxObj, sipQObjectType)) == NULL) + if ((rx = sip_api_get_cpp_ptr((sipSimpleWrapper *)rxObj, sipTQObjectType)) == NULL) return NULL; - if (isQtSignal(slot)) + if (isTQtSignal(slot)) rx = newSignal(rx, memberp); return rx; @@ -407,20 +407,20 @@ void *sip_api_convert_rx(sipWrapper *txSelf, const char *sigargs, /* - * Connect a Qt signal or a Python signal to a Qt slot, a Qt signal, a Python + * Connect a TQt signal or a Python signal to a TQt slot, a TQt signal, a Python * slot or a Python signal. This is all possible combinations. */ PyObject *sip_api_connect_rx(PyObject *txObj, const char *sig, PyObject *rxObj, const char *slot, int type) { - /* Handle Qt signals. */ - if (isQtSignal(sig)) + /* Handle TQt signals. */ + if (isTQtSignal(sig)) { void *tx, *rx; const char *member, *real_sig; int res; - if ((tx = sip_api_get_cpp_ptr((sipSimpleWrapper *)txObj, sipQObjectType)) == NULL) + if ((tx = sip_api_get_cpp_ptr((sipSimpleWrapper *)txObj, sipTQObjectType)) == NULL) return NULL; real_sig = sig; @@ -431,15 +431,15 @@ PyObject *sip_api_connect_rx(PyObject *txObj, const char *sig, PyObject *rxObj, if ((rx = sip_api_convert_rx((sipWrapper *)txObj, sig, rxObj, slot, &member, 0)) == NULL) return NULL; - res = sipQtSupport->qt_connect(tx, real_sig, rx, member, type); + res = sipTQtSupport->qt_connect(tx, real_sig, rx, member, type); return PyBool_FromLong(res); } - /* Handle Python signals. Only PyQt3 will get this far. */ - assert(sipQtSupport->qt_connect_py_signal); + /* Handle Python signals. Only PyTQt3 will get this far. */ + assert(sipTQtSupport->qt_connect_py_signal); - if (sipQtSupport->qt_connect_py_signal(txObj, sig, rxObj, slot) < 0) + if (sipTQtSupport->qt_connect_py_signal(txObj, sig, rxObj, slot) < 0) return NULL; Py_INCREF(Py_True); @@ -448,20 +448,20 @@ PyObject *sip_api_connect_rx(PyObject *txObj, const char *sig, PyObject *rxObj, /* - * Disconnect a signal to a signal or a Qt slot. + * Disconnect a signal to a signal or a TQt slot. */ PyObject *sip_api_disconnect_rx(PyObject *txObj,const char *sig, PyObject *rxObj,const char *slot) { - /* Handle Qt signals. */ - if (isQtSignal(sig)) + /* Handle TQt signals. */ + if (isTQtSignal(sig)) { sipSimpleWrapper *txSelf = (sipSimpleWrapper *)txObj; void *tx, *rx; const char *member; int res; - if ((tx = sip_api_get_cpp_ptr(txSelf, sipQObjectType)) == NULL) + if ((tx = sip_api_get_cpp_ptr(txSelf, sipTQObjectType)) == NULL) return NULL; if ((rx = sipGetRx(txSelf, sig, rxObj, slot, &member)) == NULL) @@ -473,22 +473,22 @@ PyObject *sip_api_disconnect_rx(PyObject *txObj,const char *sig, /* Handle Python signals. */ tx = findSignal(tx, &sig); - res = sipQtSupport->qt_disconnect(tx, sig, rx, member); + res = sipTQtSupport->qt_disconnect(tx, sig, rx, member); /* * Delete it if it is a universal slot as this will be it's only * connection. If the slot is actually a universal signal then it * should leave it in place. */ - sipQtSupport->qt_destroy_universal_slot(rx); + sipTQtSupport->qt_destroy_universal_slot(rx); return PyBool_FromLong(res); } - /* Handle Python signals. Only PyQt3 will get this far. */ - assert(sipQtSupport->qt_disconnect_py_signal); + /* Handle Python signals. Only PyTQt3 will get this far. */ + assert(sipTQtSupport->qt_disconnect_py_signal); - sipQtSupport->qt_disconnect_py_signal(txObj, sig, rxObj, slot); + sipTQtSupport->qt_disconnect_py_signal(txObj, sig, rxObj, slot); Py_INCREF(Py_True); return Py_True; @@ -530,7 +530,7 @@ static char *sipStrdup(const char *s) /* * Initialise a slot, returning 0 if there was no error. If the signal was a - * Qt signal, then the slot may be a Python signal or a Python slot. If the + * TQt signal, then the slot may be a Python signal or a Python slot. If the * signal was a Python signal, then the slot may be anything. */ int sip_api_save_slot(sipSlot *sp, PyObject *rxObj, const char *slot) @@ -576,7 +576,7 @@ int sip_api_save_slot(sipSlot *sp, PyObject *rxObj, const char *slot) * because they are generated on the fly and we can't take a * reference as that may keep the instance (ie. self) alive. * We therefore treat it as if the user had specified the slot - * at "obj, SLOT('meth()')" rather than "obj.meth" (see below). + * at "obj, TQT_SLOT('meth()')" rather than "obj.meth" (see below). */ const char *meth; @@ -613,11 +613,11 @@ int sip_api_save_slot(sipSlot *sp, PyObject *rxObj, const char *slot) } else if ((sp -> name = sipStrdup(slot)) == NULL) return -1; - else if (isQtSlot(slot)) + else if (isTQtSlot(slot)) { /* - * The user has decided to connect a Python signal to a Qt slot and - * specified the slot as "obj, SLOT('meth()')" rather than "obj.meth". + * The user has decided to connect a Python signal to a TQt slot and + * specified the slot as "obj, TQT_SLOT('meth()')" rather than "obj.meth". */ char *tail; @@ -638,7 +638,7 @@ int sip_api_save_slot(sipSlot *sp, PyObject *rxObj, const char *slot) sp -> pyobj = rxObj; } else - /* It's a Qt signal. */ + /* It's a TQt signal. */ sp -> pyobj = rxObj; return 0; diff --git a/siplib/sip.h b/siplib/sip.h index b22b77c..68622be 100644 --- a/siplib/sip.h +++ b/siplib/sip.h @@ -22,8 +22,8 @@ /* - * This gets round a problem with Qt's moc and Python v2.3. Strictly speaking - * it's a Qt problem but later versions of Python include a fix for it so we + * This gets round a problem with TQt's tqmoc and Python v2.3. Strictly speaking + * it's a TQt problem but later versions of Python include a fix for it so we * might as well too. */ #undef slots @@ -99,7 +99,7 @@ extern "C" { * 4.0 Much refactoring. * * 3.8 Added sip_api_register_qt_metatype() and sip_api_deprecated(). - * Added qt_register_meta_type() to the Qt support API. + * Added qt_register_meta_type() to the TQt support API. * The C/C++ names of enums and types are now always defined in the * relevant structures and don't default to the Python name. * Added the 'XE' format characters to sip_api_parse_args(). @@ -125,9 +125,9 @@ extern "C" { * 3.5 Added the td_pickle field to the sipTypeDef structure. * Added sip_api_transfer_break(). * - * 3.4 Added qt_find_connection() to the Qt support API. - * Added sip_api_string_as_char(), sip_api_unicode_as_wchar(), - * sip_api_unicode_as_wstring(), sip_api_find_class(), + * 3.4 Added qt_find_connection() to the TQt support API. + * Added sip_api_string_as_char(), sip_api_tqunicode_as_wchar(), + * sip_api_tqunicode_as_wstring(), sip_api_find_class(), * sip_api_find_named_enum() and sip_api_parse_signature(). * Added the 'A', 'w' and 'x' format characters to sip_api_parse_args(), * sip_api_parse_result(), sip_api_build_result() and @@ -139,7 +139,7 @@ extern "C" { * * 3.1 Added sip_api_add_mapped_type_instance(). * - * 3.0 Moved the Qt support out of the sip module and into PyQt. This is + * 3.0 Moved the TQt support out of the sip module and into PyTQt. This is * such a dramatic change that there is no point in attempting to maintain * backwards compatibility. * @@ -927,8 +927,8 @@ typedef struct _sipExportedModuleDef { /* The imported modules. */ sipImportedModuleDef *em_imports; - /* The optional Qt support API. */ - struct _sipQtAPI *em_qt_api; + /* The optional TQt support API. */ + struct _sipTQtAPI *em_qt_api; /* The number of types. */ int em_nrtypes; @@ -1199,13 +1199,13 @@ typedef struct _sipPyMethod { /* - * A slot (in the Qt, rather than Python, sense). + * A slot (in the TQt, rather than Python, sense). */ typedef struct _sipSlot { - /* Name if a Qt or Python signal. */ + /* Name if a TQt or Python signal. */ char *name; - /* Signal or Qt slot object. */ + /* Signal or TQt slot object. */ PyObject *pyobj; /* Python slot method, pyobj is NULL. */ @@ -1302,7 +1302,7 @@ typedef struct _sipAPIDef { const sipStringTypeClassMap *map, int maplen); /* - * The following may be used by Qt support code but no other handwritten + * The following may be used by TQt support code but no other handwritten * code. */ void (*api_free_sipslot)(sipSlot *slot); @@ -1355,11 +1355,11 @@ typedef struct _sipAPIDef { char (*api_string_as_utf8_char)(PyObject *obj); const char *(*api_string_as_utf8_string)(PyObject **obj); #if defined(HAVE_WCHAR_H) - wchar_t (*api_unicode_as_wchar)(PyObject *obj); - wchar_t *(*api_unicode_as_wstring)(PyObject *obj); + wchar_t (*api_tqunicode_as_wchar)(PyObject *obj); + wchar_t *(*api_tqunicode_as_wstring)(PyObject *obj); #else - int (*api_unicode_as_wchar)(PyObject *obj); - int *(*api_unicode_as_wstring)(PyObject *obj); + int (*api_tqunicode_as_wchar)(PyObject *obj); + int *(*api_tqunicode_as_wstring)(PyObject *obj); #endif int (*api_deprecated)(const char *classname, const char *method); void (*api_keep_reference)(PyObject *self, int key, PyObject *obj); @@ -1371,9 +1371,9 @@ typedef struct _sipAPIDef { /* - * The API implementing the optional Qt support. + * The API implementing the optional TQt support. */ -typedef struct _sipQtAPI { +typedef struct _sipTQtAPI { sipTypeDef **qt_qobject; void *(*qt_create_universal_signal)(void *, const char **); void *(*qt_find_universal_signal)(void *, const char **); @@ -1391,7 +1391,7 @@ typedef struct _sipQtAPI { const char *); void (*qt_disconnect_py_signal)(PyObject *, const char *, PyObject *, const char *); -} sipQtAPI; +} sipTQtAPI; /* @@ -1411,7 +1411,7 @@ typedef struct _sipQtAPI { /* - * These flags are specific to the Qt support API. + * These flags are specific to the TQt support API. */ #define SIP_SINGLE_SHOT 0x01 /* The connection is single shot. */ @@ -1495,27 +1495,27 @@ typedef struct _sipQtAPI { /* - * The following are PyQt3-specific extensions. In SIP v5 they will be pushed - * out to a plugin supplied by PyQt3. + * The following are PyTQt3-specific extensions. In SIP v5 they will be pushed + * out to a plugin supplied by PyTQt3. */ typedef int (*pyqt3EmitFunc)(sipSimpleWrapper *, PyObject *); /* - * Maps the name of a Qt signal to a wrapper function to emit it. + * Maps the name of a TQt signal to a wrapper function to emit it. */ -typedef struct _pyqt3QtSignal { +typedef struct _pyqt3TQtSignal { /* The signal name. */ const char *st_name; /* The emitter function. */ pyqt3EmitFunc st_emitfunc; -} pyqt3QtSignal; +} pyqt3TQtSignal; /* - * This is the PyQt3-specific extension to the generated class type structure. + * This is the PyTQt3-specific extension to the generated class type structure. */ typedef struct _pyqt3ClassTypeDef { /* @@ -1524,20 +1524,20 @@ typedef struct _pyqt3ClassTypeDef { */ sipClassTypeDef super; - /* The emit table for Qt signals. */ - pyqt3QtSignal *qt3_emit; + /* The emit table for TQt signals. */ + pyqt3TQtSignal *qt3_emit; } pyqt3ClassTypeDef; /* - * The following are PyQt4-specific extensions. In SIP v5 they will be pushed - * out to a plugin supplied by PyQt4. + * The following are PyTQt4-specific extensions. In SIP v5 they will be pushed + * out to a plugin supplied by PyTQt4. */ /* - * The description of a Qt signal for PyQt4. + * The description of a TQt signal for PyTQt4. */ -typedef struct _pyqt4QtSignal { +typedef struct _pyqt4TQtSignal { /* The C++ name and signature of the signal. */ const char *signature; @@ -1549,11 +1549,11 @@ typedef struct _pyqt4QtSignal { * code that implements those methods. */ PyMethodDef *non_signals; -} pyqt4QtSignal; +} pyqt4TQtSignal; /* - * This is the PyQt4-specific extension to the generated class type structure. + * This is the PyTQt4-specific extension to the generated class type structure. */ typedef struct _pyqt4ClassTypeDef { /* @@ -1562,12 +1562,12 @@ typedef struct _pyqt4ClassTypeDef { */ sipClassTypeDef super; - /* A pointer to the QObject sub-class's staticMetaObject class variable. */ + /* A pointer to the TQObject sub-class's staticMetaObject class variable. */ const void *qt4_static_metaobject; /* * A set of flags. At the moment only bit 0 is used to say if the type is - * derived from QFlags. + * derived from TQFlags. */ unsigned qt4_flags; @@ -1575,7 +1575,7 @@ typedef struct _pyqt4ClassTypeDef { * The table of signals emitted by the type. These are grouped by signal * name. */ - const pyqt4QtSignal *qt4_signals; + const pyqt4TQtSignal *qt4_signals; } pyqt4ClassTypeDef; diff --git a/siplib/sipint.h b/siplib/sipint.h index 19a8b1b..3758b36 100644 --- a/siplib/sipint.h +++ b/siplib/sipint.h @@ -89,9 +89,9 @@ PyObject *sip_api_convert_from_const_void_ptr_and_size(const void *val, SIP_SSIZE_T size); -extern sipQtAPI *sipQtSupport; /* The Qt support API. */ +extern sipTQtAPI *sipTQtSupport; /* The TQt support API. */ extern sipWrapperType sipSimpleWrapper_Type; /* The simple wrapper type. */ -extern sipTypeDef *sipQObjectType; /* The QObject type. */ +extern sipTypeDef *sipTQObjectType; /* The TQObject type. */ void *sipGetRx(sipSimpleWrapper *txSelf, const char *sigargs, PyObject *rxObj, const char *slot, const char **memberp); diff --git a/siplib/siplib.c b/siplib/siplib.c index f419b6b..9c8ad30 100644 --- a/siplib/siplib.c +++ b/siplib/siplib.c @@ -232,11 +232,11 @@ static const char *sip_api_string_as_latin1_string(PyObject **obj); static char sip_api_string_as_utf8_char(PyObject *obj); static const char *sip_api_string_as_utf8_string(PyObject **obj); #if defined(HAVE_WCHAR_H) -static wchar_t sip_api_unicode_as_wchar(PyObject *obj); -static wchar_t *sip_api_unicode_as_wstring(PyObject *obj); +static wchar_t sip_api_tqunicode_as_wchar(PyObject *obj); +static wchar_t *sip_api_tqunicode_as_wstring(PyObject *obj); #else -static int sip_api_unicode_as_wchar(PyObject *obj); -static int *sip_api_unicode_as_wstring(PyObject *obj); +static int sip_api_tqunicode_as_wchar(PyObject *obj); +static int *sip_api_tqunicode_as_wstring(PyObject *obj); #endif static void sip_api_transfer_break(PyObject *self); static int sip_api_deprecated(const char *classname, const char *method); @@ -316,7 +316,7 @@ static const sipAPIDef sip_api = { sip_api_map_int_to_class, sip_api_map_string_to_class, /* - * The following may be used by Qt support code but by no other handwritten + * The following may be used by TQt support code but by no other handwritten * code. */ sip_api_free_sipslot, @@ -357,8 +357,8 @@ static const sipAPIDef sip_api = { sip_api_string_as_latin1_string, sip_api_string_as_utf8_char, sip_api_string_as_utf8_string, - sip_api_unicode_as_wchar, - sip_api_unicode_as_wstring, + sip_api_tqunicode_as_wchar, + sip_api_tqunicode_as_wstring, sip_api_deprecated, sip_api_keep_reference, sip_api_parse_kwd_args, @@ -494,8 +494,8 @@ static PyTypeObject sipEnumType_Type = { }; -sipQtAPI *sipQtSupport = NULL; -sipTypeDef *sipQObjectType; +sipTQtAPI *sipTQtSupport = NULL; +sipTypeDef *sipTQObjectType; /* @@ -541,7 +541,7 @@ static int parsePass2(sipSimpleWrapper *self, int selfarg, PyObject *sipArgs, va_list va); static PyObject *signature_FromDocstring(const char *doc, SIP_SSIZE_T line); static PyObject *detail_FromFailure(PyObject *failure_obj); -static int isQObject(PyObject *obj); +static int isTQObject(PyObject *obj); static int canConvertFromSequence(PyObject *seq, const sipTypeDef *td); static int convertFromSequence(PyObject *seq, const sipTypeDef *td, void **array, SIP_SSIZE_T *nr_elem); @@ -834,7 +834,7 @@ PyMODINIT_FUNC SIP_MODULE_ENTRY(void) /* Initialise the object map. */ sipOMInit(&cppPyMap); - sipQtSupport = NULL; + sipTQtSupport = NULL; /* * Get the current interpreter. This will be shared between all @@ -1247,11 +1247,11 @@ static int sip_api_export_module(sipExportedModuleDef *client, return -1; } - /* Only one module can claim to wrap QObject. */ + /* Only one module can claim to wrap TQObject. */ if (em->em_qt_api != NULL && client->em_qt_api != NULL) { PyErr_Format(PyExc_RuntimeError, - "the %s and %s modules both wrap the QObject class", + "the %s and %s modules both wrap the TQObject class", full_name, sipNameOfModule(em)); return -1; @@ -1383,11 +1383,11 @@ static int sip_api_init_module(sipExportedModuleDef *client, } } - /* Set any Qt support API. */ + /* Set any TQt support API. */ if (client->em_qt_api != NULL) { - sipQtSupport = client->em_qt_api; - sipQObjectType = *sipQtSupport->qt_qobject; + sipTQtSupport = client->em_qt_api; + sipTQObjectType = *sipTQtSupport->qt_qobject; } /* Append any initialiser extenders to the relevant classes. */ @@ -3727,13 +3727,13 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, case 'R': { - /* Sub-class of QObject. */ + /* Sub-class of TQObject. */ PyObject **p = va_arg(va, PyObject **); if (arg != NULL) { - if (isQObject(arg)) + if (isTQObject(arg)) { *p = arg; } @@ -3796,13 +3796,13 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, case 'q': { - /* Qt receiver to connect. */ + /* TQt receiver to connect. */ va_arg(va, char *); va_arg(va, void **); va_arg(va, const char **); - if (arg != NULL && !isQObject(arg)) + if (arg != NULL && !isTQObject(arg)) { failure.reason = WrongType; failure.detail_obj = arg; @@ -3814,13 +3814,13 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, case 'Q': { - /* Qt receiver to disconnect. */ + /* TQt receiver to disconnect. */ va_arg(va, char *); va_arg(va, void **); va_arg(va, const char **); - if (arg != NULL && !isQObject(arg)) + if (arg != NULL && !isTQObject(arg)) { failure.reason = WrongType; failure.detail_obj = arg; @@ -3839,7 +3839,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, va_arg(va, void **); va_arg(va, const char **); - if (arg != NULL && (sipQtSupport == NULL || !PyCallable_Check(arg))) + if (arg != NULL && (sipTQtSupport == NULL || !PyCallable_Check(arg))) { failure.reason = WrongType; failure.detail_obj = arg; @@ -3857,7 +3857,7 @@ static int parsePass1(PyObject **parseErrp, sipSimpleWrapper **selfp, va_arg(va, void **); va_arg(va, const char **); - if (arg != NULL && (sipQtSupport == NULL || !PyCallable_Check(arg))) + if (arg != NULL && (sipTQtSupport == NULL || !PyCallable_Check(arg))) { failure.reason = WrongType; failure.detail_obj = arg; @@ -4572,7 +4572,7 @@ static int parsePass2(sipSimpleWrapper *self, int selfarg, PyObject *sipArgs, case 'q': { - /* Qt receiver to connect. */ + /* TQt receiver to connect. */ char *sig = va_arg(va, char *); void **rx = va_arg(va, void **); @@ -4592,7 +4592,7 @@ static int parsePass2(sipSimpleWrapper *self, int selfarg, PyObject *sipArgs, case 'Q': { - /* Qt receiver to disconnect. */ + /* TQt receiver to disconnect. */ char *sig = va_arg(va, char *); void **rx = va_arg(va, void **); @@ -4850,11 +4850,11 @@ static int parsePass2(sipSimpleWrapper *self, int selfarg, PyObject *sipArgs, /* - * Return TRUE if an object is a QObject. + * Return TRUE if an object is a TQObject. */ -static int isQObject(PyObject *obj) +static int isTQObject(PyObject *obj) { - return (sipQtSupport != NULL && PyObject_TypeCheck(obj, sipTypeAsPyTypeObject(sipQObjectType))); + return (sipTQtSupport != NULL && PyObject_TypeCheck(obj, sipTypeAsPyTypeObject(sipTQObjectType))); } @@ -6302,7 +6302,7 @@ static void sip_api_no_method(PyObject *parseErr, const char *scope, /* - * Return a string/unicode object extracted from a particular line of a + * Return a string/tqunicode object extracted from a particular line of a * docstring. */ static PyObject *signature_FromDocstring(const char *doc, SIP_SSIZE_T line) @@ -6339,7 +6339,7 @@ static PyObject *signature_FromDocstring(const char *doc, SIP_SSIZE_T line) /* - * Return a string/unicode object that describes the given failure. + * Return a string/tqunicode object that describes the given failure. */ static PyObject *detail_FromFailure(PyObject *failure_obj) { @@ -7363,8 +7363,8 @@ void *sipGetAddress(sipSimpleWrapper *sw) /* * Get the C/C++ pointer for a complex object. Note that not casting the C++ - * pointer is a bug. However this is only ever called by PyQt3 signal emitter - * code and PyQt doesn't contain anything that multiply inherits from QObject. + * pointer is a bug. However this is only ever called by PyTQt3 signal emitter + * code and PyTQt doesn't contain anything that multiply inherits from TQObject. */ static void *sip_api_get_complex_cpp_ptr(sipSimpleWrapper *sw) { @@ -8574,7 +8574,7 @@ static int sipSimpleWrapper_init(sipSimpleWrapper *self, PyObject *args, /* * Get any keyword handler if necessary. In SIP v5 this will be - * generalised and not PyQt specific. + * generalised and not PyTQt specific. */ if (!got_kw_handler) { @@ -8584,9 +8584,9 @@ static int sipSimpleWrapper_init(sipSimpleWrapper *self, PyObject *args, /* * We are interested in unused keyword arguments if we are creating a - * QObject and we have a handler. + * TQObject and we have a handler. */ - unused_p = (kw_handler != NULL && isQObject((PyObject *)self)) ? &unused : NULL; + unused_p = (kw_handler != NULL && isTQObject((PyObject *)self)) ? &unused : NULL; unused = NULL; /* Check there is no existing C++ instance waiting to be wrapped. */ @@ -8914,7 +8914,7 @@ static void sipSimpleWrapper_dealloc(sipSimpleWrapper *self) /* * Now that the C++ object no longer exists we can tidy up the Python * object. We used to do this first but that meant lambda slots were - * removed too soon (if they were connected to QObject.destroyed()). + * removed too soon (if they were connected to TQObject.destroyed()). */ sipSimpleWrapper_clear(self); @@ -9189,7 +9189,7 @@ static int sipWrapper_clear(sipWrapper *self) vret = sipSimpleWrapper_clear(sw); /* Remove any slots connected via a proxy. */ - if (sipQtSupport != NULL && sipPossibleProxy(sw)) + if (sipTQtSupport != NULL && sipPossibleProxy(sw)) { void *tx = sipGetAddress(sw); @@ -9198,7 +9198,7 @@ static int sipWrapper_clear(sipWrapper *self) sipSlot *slot; void *context = NULL; - while ((slot = sipQtSupport->qt_find_sipslot(tx, &context)) != NULL) + while ((slot = sipTQtSupport->qt_find_sipslot(tx, &context)) != NULL) { sip_api_clear_any_slot_reference(slot); @@ -9208,12 +9208,12 @@ static int sipWrapper_clear(sipWrapper *self) } } - /* Detach children (which will be owned by C/C++). */ + /* Detach tqchildren (which will be owned by C/C++). */ while ((sw = (sipSimpleWrapper *)self->first_child) != NULL) { /* * Although this object is being garbage collected it doesn't follow - * that it's children should be. So we make sure that the child stays + * that it's tqchildren should be. So we make sure that the child stays * alive and remember we have done so. */ Py_INCREF(sw); @@ -9256,8 +9256,8 @@ static int sipWrapper_traverse(sipWrapper *self, visitproc visit, void *arg) if ((vret = sipSimpleWrapper_traverse(sw, visit, arg)) != 0) return vret; - /* This should be handwritten code in PyQt. */ - if (sipQtSupport != NULL) + /* This should be handwritten code in PyTQt. */ + if (sipTQtSupport != NULL) { void *tx = sipGetAddress(sw); @@ -9266,7 +9266,7 @@ static int sipWrapper_traverse(sipWrapper *self, visitproc visit, void *arg) sipSlot *slot; void *context = NULL; - while ((slot = sipQtSupport->qt_find_sipslot(tx, &context)) != NULL) + while ((slot = sipTQtSupport->qt_find_sipslot(tx, &context)) != NULL) { if ((vret = sip_api_visit_slot(slot, visit, arg)) != 0) return vret; @@ -9672,7 +9672,7 @@ static void forgetObject(sipSimpleWrapper *sw) * further calls that pass the instance as an argument. If this is * still in the map then it's reference count would be increased (to * one) and bad things happen when it drops back to zero again. (An - * example is PyQt events generated during the dtor call being passed + * example is PyTQt events generated during the dtor call being passed * to an event filter implemented in Python.) By removing it from the * map first we ensure that a new Python object is created. */ @@ -9788,7 +9788,7 @@ static void *sip_api_import_symbol(const char *name) /* * Visit a slot connected to an object for the cyclic garbage collector. This - * is only called externally by PyQt3. + * is only called externally by PyTQt3. */ static int sip_api_visit_slot(sipSlot *slot, visitproc visit, void *arg) { @@ -9802,7 +9802,7 @@ static int sip_api_visit_slot(sipSlot *slot, visitproc visit, void *arg) /* * Clear a slot if it has an extra reference to keep it alive. This is only - * called externally by PyQt3. + * called externally by PyTQt3. */ static void sip_api_clear_any_slot_reference(sipSlot *slot) { @@ -9888,7 +9888,7 @@ static char sip_api_string_as_ascii_char(PyObject *obj) #if PY_MAJOR_VERSION >= 3 "bytes or ASCII string of length 1 expected not '%s'", #else - "string or ASCII unicode of length 1 expected not '%s'", + "string or ASCII tqunicode of length 1 expected not '%s'", #endif Py_TYPE(obj)->tp_name); @@ -9924,7 +9924,7 @@ static char sip_api_string_as_latin1_char(PyObject *obj) #if PY_MAJOR_VERSION >= 3 "bytes or Latin-1 string of length 1 expected not '%s'", #else - "string or Latin-1 unicode of length 1 expected not '%s'", + "string or Latin-1 tqunicode of length 1 expected not '%s'", #endif Py_TYPE(obj)->tp_name); @@ -9960,7 +9960,7 @@ static char sip_api_string_as_utf8_char(PyObject *obj) #if PY_MAJOR_VERSION >= 3 "bytes or UTF-8 string of length 1 expected not '%s'", #else - "string or UTF-8 unicode of length 1 expected not '%s'", + "string or UTF-8 tqunicode of length 1 expected not '%s'", #endif Py_TYPE(obj)->tp_name); @@ -10028,7 +10028,7 @@ static const char *sip_api_string_as_ascii_string(PyObject **obj) #if PY_MAJOR_VERSION >= 3 "bytes or ASCII string expected not '%s'", #else - "string or ASCII unicode expected not '%s'", + "string or ASCII tqunicode expected not '%s'", #endif Py_TYPE(s)->tp_name); @@ -10067,7 +10067,7 @@ static const char *sip_api_string_as_latin1_string(PyObject **obj) #if PY_MAJOR_VERSION >= 3 "bytes or Latin-1 string expected not '%s'", #else - "string or Latin-1 unicode expected not '%s'", + "string or Latin-1 tqunicode expected not '%s'", #endif Py_TYPE(s)->tp_name); @@ -10106,7 +10106,7 @@ static const char *sip_api_string_as_utf8_string(PyObject **obj) #if PY_MAJOR_VERSION >= 3 "bytes or UTF-8 string expected not '%s'", #else - "string or UTF-8 unicode expected not '%s'", + "string or UTF-8 tqunicode expected not '%s'", #endif Py_TYPE(s)->tp_name); @@ -10215,7 +10215,7 @@ static int parseBytes_AsString(PyObject *obj, const char **ap) /* * Convert a Python object to a wide character. */ -static wchar_t sip_api_unicode_as_wchar(PyObject *obj) +static wchar_t sip_api_tqunicode_as_wchar(PyObject *obj) { wchar_t ch; @@ -10225,7 +10225,7 @@ static wchar_t sip_api_unicode_as_wchar(PyObject *obj) #if PY_MAJOR_VERSION >= 3 "string" #else - "unicode string" + "tqunicode string" #endif " of length 1 expected, not %s", Py_TYPE(obj)->tp_name); @@ -10239,7 +10239,7 @@ static wchar_t sip_api_unicode_as_wchar(PyObject *obj) /* * Convert a Python object to a wide character string on the heap. */ -static wchar_t *sip_api_unicode_as_wstring(PyObject *obj) +static wchar_t *sip_api_tqunicode_as_wstring(PyObject *obj) { wchar_t *p; @@ -10249,7 +10249,7 @@ static wchar_t *sip_api_unicode_as_wstring(PyObject *obj) #if PY_MAJOR_VERSION >= 3 "string" #else - "unicode string" + "tqunicode string" #endif " expected, not %s", Py_TYPE(obj)->tp_name); @@ -10437,7 +10437,7 @@ static int convertToWCharString(PyObject *obj, wchar_t **ap) /* * Convert a Python object to a wide character. */ -static int sip_api_unicode_as_wchar(PyObject *obj) +static int sip_api_tqunicode_as_wchar(PyObject *obj) { raiseNoWChar(); @@ -10448,7 +10448,7 @@ static int sip_api_unicode_as_wchar(PyObject *obj) /* * Convert a Python object to a wide character. */ -static int *sip_api_unicode_as_wstring(PyObject *obj) +static int *sip_api_tqunicode_as_wstring(PyObject *obj) { raiseNoWChar(); diff --git a/siputils.py b/siputils.py index bb5959e..2df75af 100644 --- a/siputils.py +++ b/siputils.py @@ -927,7 +927,7 @@ class Makefile: error("\"%s\" is missing from \"%s\"." % (i, bfname)) # Get the optional values. - for i in ("headers", "moc_headers"): + for i in ("headers", "tqmoc_headers"): try: bdict[i] except KeyError: @@ -945,12 +945,12 @@ class Makefile: root, discard = os.path.splitext(f) olist.append(root + ext) - for f in bdict["moc_headers"].split(): + for f in bdict["tqmoc_headers"].split(): if not self._qt: - error("\"%s\" defines \"moc_headers\" for a non-Qt module." % bfname) + error("\"%s\" defines \"tqmoc_headers\" for a non-Qt module." % bfname) root, discard = os.path.splitext(f) - olist.append("moc_" + root + ext) + olist.append("tqmoc_" + root + ext) bdict["objects"] = ' '.join(olist) @@ -967,9 +967,9 @@ class Makefile: for f in build["objects"].split(): mfile.write("\t-%s %s\n" % (self.rm, f)) - for f in build["moc_headers"].split(): + for f in build["tqmoc_headers"].split(): root, discard = os.path.splitext(f) - mfile.write("\t-%s moc_%s.cpp\n" % (self.rm, root)) + mfile.write("\t-%s tqmoc_%s.cpp\n" % (self.rm, root)) def ready(self): """The Makefile is now ready to be used. @@ -1056,7 +1056,7 @@ class Makefile: mfile.write("LIBS = %s\n" % ' '.join(libs)) if self._qt: - mfile.write("MOC = %s\n" % _quote(self.required_string("MOC"))) + mfile.write("TQMOC = %s\n" % _quote(self.required_string("TQMOC"))) if self._src_dir != self.dir: mfile.write("VPATH = %s\n\n" % self._src_dir) @@ -1507,7 +1507,7 @@ class ModuleMakefile(Makefile): mfile.write("TARGET = %s\n" % (self._target + "." + ext)) mfile.write("OFILES = %s\n" % self._build["objects"]) - mfile.write("HFILES = %s %s\n" % (self._build["headers"], self._build["moc_headers"])) + mfile.write("HFILES = %s %s\n" % (self._build["headers"], self._build["tqmoc_headers"])) mfile.write("\n") if self.static: @@ -1536,12 +1536,12 @@ class ModuleMakefile(Makefile): mfile.write("\nall: $(TARGET)\n") mfile.write("\n$(OFILES): $(HFILES)\n") - for mf in self._build["moc_headers"].split(): + for mf in self._build["tqmoc_headers"].split(): root, discard = os.path.splitext(mf) - cpp = "moc_" + root + ".cpp" + cpp = "tqmoc_" + root + ".cpp" mfile.write("\n%s: %s\n" % (cpp, mf)) - mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) + mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf)) mfile.write("\n$(TARGET): $(OFILES)\n") @@ -1825,15 +1825,15 @@ class ProgramMakefile(Makefile): mfile.write("\nall: $(TARGET)\n") mfile.write("\n$(OFILES): $(HFILES)\n") - for mf in self._build["moc_headers"].split(): + for mf in self._build["tqmoc_headers"].split(): root, _ = os.path.splitext(mf) - cpp = "moc_" + root + ".cpp" + cpp = "tqmoc_" + root + ".cpp" if self._src_dir != self.dir: mf = os.path.join(self._src_dir, mf) mfile.write("\n%s: %s\n" % (cpp, mf)) - mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) + mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf)) mfile.write("\n$(TARGET): $(OFILES)\n") diff --git a/siputils.py.orig b/siputils.py.orig index 304e0f4..ff50d69 100644 --- a/siputils.py.orig +++ b/siputils.py.orig @@ -927,7 +927,7 @@ class Makefile: error("\"%s\" is missing from \"%s\"." % (i, bfname)) # Get the optional values. - for i in ("headers", "moc_headers"): + for i in ("headers", "tqmoc_headers"): try: bdict[i] except KeyError: @@ -945,12 +945,12 @@ class Makefile: root, discard = os.path.splitext(f) olist.append(root + ext) - for f in bdict["moc_headers"].split(): + for f in bdict["tqmoc_headers"].split(): if not self._qt: - error("\"%s\" defines \"moc_headers\" for a non-Qt module." % bfname) + error("\"%s\" defines \"tqmoc_headers\" for a non-Qt module." % bfname) root, discard = os.path.splitext(f) - olist.append("moc_" + root + ext) + olist.append("tqmoc_" + root + ext) bdict["objects"] = ' '.join(olist) @@ -967,9 +967,9 @@ class Makefile: for f in build["objects"].split(): mfile.write("\t-%s %s\n" % (self.rm, f)) - for f in build["moc_headers"].split(): + for f in build["tqmoc_headers"].split(): root, discard = os.path.splitext(f) - mfile.write("\t-%s moc_%s.cpp\n" % (self.rm, root)) + mfile.write("\t-%s tqmoc_%s.cpp\n" % (self.rm, root)) def ready(self): """The Makefile is now ready to be used. @@ -1056,7 +1056,7 @@ class Makefile: mfile.write("LIBS = %s\n" % ' '.join(libs)) if self._qt: - mfile.write("MOC = %s\n" % _quote(self.required_string("MOC"))) + mfile.write("TQMOC = %s\n" % _quote(self.required_string("TQMOC"))) if self._src_dir != self.dir: mfile.write("VPATH = %s\n\n" % self._src_dir) @@ -1507,7 +1507,7 @@ class ModuleMakefile(Makefile): mfile.write("TARGET = %s\n" % (self._target + "." + ext)) mfile.write("OFILES = %s\n" % self._build["objects"]) - mfile.write("HFILES = %s %s\n" % (self._build["headers"], self._build["moc_headers"])) + mfile.write("HFILES = %s %s\n" % (self._build["headers"], self._build["tqmoc_headers"])) mfile.write("\n") if self.static: @@ -1536,15 +1536,15 @@ class ModuleMakefile(Makefile): mfile.write("\nall: $(TARGET)\n") mfile.write("\n$(OFILES): $(HFILES)\n") - for mf in self._build["moc_headers"].split(): + for mf in self._build["tqmoc_headers"].split(): root, _ = os.path.splitext(mf) - cpp = "moc_" + root + ".cpp" + cpp = "tqmoc_" + root + ".cpp" if self._src_dir != self.dir: mf = os.path.join(self._src_dir, mf) mfile.write("\n%s: %s\n" % (cpp, mf)) - mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) + mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf)) mfile.write("\n$(TARGET): $(OFILES)\n") @@ -1828,15 +1828,15 @@ class ProgramMakefile(Makefile): mfile.write("\nall: $(TARGET)\n") mfile.write("\n$(OFILES): $(HFILES)\n") - for mf in self._build["moc_headers"].split(): + for mf in self._build["tqmoc_headers"].split(): root, _ = os.path.splitext(mf) - cpp = "moc_" + root + ".cpp" + cpp = "tqmoc_" + root + ".cpp" if self._src_dir != self.dir: mf = os.path.join(self._src_dir, mf) mfile.write("\n%s: %s\n" % (cpp, mf)) - mfile.write("\t$(MOC) -o %s %s\n" % (cpp, mf)) + mfile.write("\t$(TQMOC) -o %s %s\n" % (cpp, mf)) mfile.write("\n$(TARGET): $(OFILES)\n") diff --git a/specs/aix-g++ b/specs/aix-g++ index 438185a..4abf835 100644 --- a/specs/aix-g++ +++ b/specs/aix-g++ @@ -61,7 +61,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/aix-g++-64 b/specs/aix-g++-64 index 231f3dd..0e7ac6e 100644 --- a/specs/aix-g++-64 +++ b/specs/aix-g++-64 @@ -61,7 +61,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar -X64 cq diff --git a/specs/aix-xlc b/specs/aix-xlc index fd288a3..a93f8f7 100644 --- a/specs/aix-xlc +++ b/specs/aix-xlc @@ -46,7 +46,7 @@ QMAKE_LINK = xlC QMAKE_LINK_THREAD = xlC_r QMAKE_LINK_SHLIB = ld QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 \ - -o $(TARGET) $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS) + -o $(TARGET) $(LFLAGS) $(OBJECTS) $(OBJTQMOC) $(LIBS) QMAKE_LFLAGS = QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/aix-xlc-64 b/specs/aix-xlc-64 index 56501e7..096c7b1 100644 --- a/specs/aix-xlc-64 +++ b/specs/aix-xlc-64 @@ -48,7 +48,7 @@ QMAKE_LINK = xlC QMAKE_LINK_THREAD = xlC_r QMAKE_LINK_SHLIB = ld QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 -X 64 \ - -o $(TARGET) $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS) + -o $(TARGET) $(LFLAGS) $(OBJECTS) $(OBJTQMOC) $(LIBS) QMAKE_LFLAGS = -q64 QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -66,7 +66,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar -X64 cq diff --git a/specs/bsdi-g++ b/specs/bsdi-g++ index 9467536..86cb7bc 100644 --- a/specs/bsdi-g++ +++ b/specs/bsdi-g++ @@ -67,7 +67,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cqs diff --git a/specs/cygwin-g++ b/specs/cygwin-g++ index 09d47d0..27c07c5 100644 --- a/specs/cygwin-g++ +++ b/specs/cygwin-g++ @@ -69,7 +69,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cqs diff --git a/specs/darwin-g++ b/specs/darwin-g++ index 11e62dc..7b12fd3 100644 --- a/specs/darwin-g++ +++ b/specs/darwin-g++ @@ -69,7 +69,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/dgux-g++ b/specs/dgux-g++ index 76e01ac..f3252ec 100644 --- a/specs/dgux-g++ +++ b/specs/dgux-g++ @@ -60,7 +60,7 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cq diff --git a/specs/freebsd-g++ b/specs/freebsd-g++ index 7a42410..4fbf1da 100644 --- a/specs/freebsd-g++ +++ b/specs/freebsd-g++ @@ -62,7 +62,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/freebsd-g++34 b/specs/freebsd-g++34 index 24c7786..3b42a3f 100644 --- a/specs/freebsd-g++34 +++ b/specs/freebsd-g++34 @@ -62,7 +62,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/freebsd-g++40 b/specs/freebsd-g++40 index cb8f58e..6fcba1f 100644 --- a/specs/freebsd-g++40 +++ b/specs/freebsd-g++40 @@ -62,7 +62,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/freebsd-icc b/specs/freebsd-icc index 71d08b7..b4a0dc5 100644 --- a/specs/freebsd-icc +++ b/specs/freebsd-icc @@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-acc b/specs/hpux-acc index 0a78d97..88761f1 100644 --- a/specs/hpux-acc +++ b/specs/hpux-acc @@ -85,7 +85,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-acc-64 b/specs/hpux-acc-64 index 083c403..93d711f 100644 --- a/specs/hpux-acc-64 +++ b/specs/hpux-acc-64 @@ -106,7 +106,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-acc-o64 b/specs/hpux-acc-o64 index e6739a7..e9e4a46 100644 --- a/specs/hpux-acc-o64 +++ b/specs/hpux-acc-o64 @@ -105,7 +105,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-cc b/specs/hpux-cc index b19dc2b..68a3943 100644 --- a/specs/hpux-cc +++ b/specs/hpux-cc @@ -83,7 +83,7 @@ QMAKE_LIBS_QT = -lqt QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-g++ b/specs/hpux-g++ index 5533993..a3dcb76 100644 --- a/specs/hpux-g++ +++ b/specs/hpux-g++ @@ -67,7 +67,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpux-g++-64 b/specs/hpux-g++-64 index 0b81fcd..337c3c6 100644 --- a/specs/hpux-g++-64 +++ b/specs/hpux-g++-64 @@ -67,7 +67,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpuxi-acc b/specs/hpuxi-acc index 1596ac2..f15680e 100644 --- a/specs/hpuxi-acc +++ b/specs/hpuxi-acc @@ -104,7 +104,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hpuxi-acc-64 b/specs/hpuxi-acc-64 index 0763d14..c8b46f4 100644 --- a/specs/hpuxi-acc-64 +++ b/specs/hpuxi-acc-64 @@ -104,7 +104,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL -lXt QMAKE_LIBS_THREAD = -lpthread QMAKE_LIBS_YACC = -ly -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/hurd-g++ b/specs/hurd-g++ index 88539e8..efa0938 100644 --- a/specs/hurd-g++ +++ b/specs/hurd-g++ @@ -59,7 +59,7 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/irix-cc b/specs/irix-cc index efc47bc..ee8afa3 100644 --- a/specs/irix-cc +++ b/specs/irix-cc @@ -93,7 +93,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lm QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = CC -ar -o diff --git a/specs/irix-cc-64 b/specs/irix-cc-64 index f83d1f9..f70f7ad 100644 --- a/specs/irix-cc-64 +++ b/specs/irix-cc-64 @@ -93,7 +93,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lm QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = CC -ar -o diff --git a/specs/irix-cc-o32 b/specs/irix-cc-o32 index 0e98c77..6441f5a 100644 --- a/specs/irix-cc-o32 +++ b/specs/irix-cc-o32 @@ -70,7 +70,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = ar cq diff --git a/specs/irix-g++ b/specs/irix-g++ index 5deaa1c..32cf8f1 100644 --- a/specs/irix-g++ +++ b/specs/irix-g++ @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/irix-g++-64 b/specs/irix-g++-64 index ade0ad3..f44245c 100644 --- a/specs/irix-g++-64 +++ b/specs/irix-g++-64 @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/linux-arm-g++ b/specs/linux-arm-g++ index a1e1d4e..8be44df 100644 --- a/specs/linux-arm-g++ +++ b/specs/linux-arm-g++ @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENGL_QT = QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = arm-linux-ar cqs diff --git a/specs/linux-arm-thumb-g++ b/specs/linux-arm-thumb-g++ index 31bb345..02e17d9 100644 --- a/specs/linux-arm-thumb-g++ +++ b/specs/linux-arm-thumb-g++ @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENGL_QT = QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = arm-linux-ar cqs diff --git a/specs/linux-armv6-g++ b/specs/linux-armv6-g++ index 92dbfd7..d57f928 100644 --- a/specs/linux-armv6-g++ +++ b/specs/linux-armv6-g++ @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = QMAKE_LIBS_OPENGL_QT = QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = arm-linux-ar cqs diff --git a/specs/linux-cxx b/specs/linux-cxx index fd5aae2..1413af4 100644 --- a/specs/linux-cxx +++ b/specs/linux-cxx @@ -60,7 +60,7 @@ QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-ecc-64 b/specs/linux-ecc-64 index a6b4327..e831eae 100644 --- a/specs/linux-ecc-64 +++ b/specs/linux-ecc-64 @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-g++ b/specs/linux-g++ index 9d94ff3..d16b9fd 100644 --- a/specs/linux-g++ +++ b/specs/linux-g++ @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-g++-32 b/specs/linux-g++-32 index c0b7b79..4422f79 100644 --- a/specs/linux-g++-32 +++ b/specs/linux-g++-32 @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-g++-64 b/specs/linux-g++-64 index 7bdd3b1..77a34ea 100644 --- a/specs/linux-g++-64 +++ b/specs/linux-g++-64 @@ -71,7 +71,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-icc b/specs/linux-icc index 26c6e81..94d7abd 100644 --- a/specs/linux-icc +++ b/specs/linux-icc @@ -73,7 +73,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-kcc b/specs/linux-kcc index 6a9cf08..fca59ce 100644 --- a/specs/linux-kcc +++ b/specs/linux-kcc @@ -73,7 +73,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-kylix b/specs/linux-kylix index 335f839..0e58488 100644 --- a/specs/linux-kylix +++ b/specs/linux-kylix @@ -63,7 +63,7 @@ QMAKE_LIBS_OPENGL = -llibGLU -llibGL -llibXmu QMAKE_LIBS_OPENGL_QT = -llibGL -llibXmu QMAKE_LIBS_THREAD = -llibpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-lsb b/specs/linux-lsb index 9536716..2072345 100644 --- a/specs/linux-lsb +++ b/specs/linux-lsb @@ -68,7 +68,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/linux-pgcc b/specs/linux-pgcc index fae849d..1ce1f87 100644 --- a/specs/linux-pgcc +++ b/specs/linux-pgcc @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/lynxos-g++ b/specs/lynxos-g++ index da2ebe7..9026b50 100644 --- a/specs/lynxos-g++ +++ b/specs/lynxos-g++ @@ -65,7 +65,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/macx-g++ b/specs/macx-g++ index d28fda9..6809ca0 100644 --- a/specs/macx-g++ +++ b/specs/macx-g++ @@ -77,7 +77,7 @@ QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/macx-pbuilder b/specs/macx-pbuilder index 1e806d1..dfc8ec2 100644 --- a/specs/macx-pbuilder +++ b/specs/macx-pbuilder @@ -63,7 +63,7 @@ QMAKE_LIBS_THREAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/macx-xcode b/specs/macx-xcode index d2a5789..4592c92 100755 --- a/specs/macx-xcode +++ b/specs/macx-xcode @@ -63,7 +63,7 @@ QMAKE_LIBS_THREAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/macx-xlc b/specs/macx-xlc index 262764b..3649e9d 100644 --- a/specs/macx-xlc +++ b/specs/macx-xlc @@ -53,7 +53,7 @@ QMAKE_LINK_THREAD = xlc++_r QMAKE_LINK_SHLIB = ld #QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 \ # -o $(TARGETD) \ -# $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ +# $(LFLAGS) $(OBJECTS) $(OBJTQMOC) $(LIBS); \ # $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ # $(RANLIB) lib$(QMAKE_TARGET).a; \ # mv lib$(QMAKE_TARGET).a $(DESTDIR) @@ -74,7 +74,7 @@ QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL #QMAKE_LIBS_THREAD = -lpthreads -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/netbsd-g++ b/specs/netbsd-g++ index 0b112b1..fd6d884 100644 --- a/specs/netbsd-g++ +++ b/specs/netbsd-g++ @@ -44,7 +44,7 @@ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ -QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) +QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJTQMOC) $(LIBS) QMAKE_LFLAGS = QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -62,7 +62,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/openbsd-g++ b/specs/openbsd-g++ index 86caacd..6b89a4f 100644 --- a/specs/openbsd-g++ +++ b/specs/openbsd-g++ @@ -46,7 +46,7 @@ QMAKE_LINK = g++ QMAKE_LINK_SHLIB = g++ QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $(LFLAGS) \ $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \ - -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) + -o $(TARGETD) $(OBJECTS) $(OBJTQMOC) $(LIBS) QMAKE_LFLAGS = QMAKE_LFLAGS_RELEASE = QMAKE_LFLAGS_DEBUG = @@ -63,7 +63,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar q diff --git a/specs/qnx-g++ b/specs/qnx-g++ index c2411d4..8e0b39f 100644 --- a/specs/qnx-g++ +++ b/specs/qnx-g++ @@ -63,7 +63,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/reliant-cds b/specs/reliant-cds index fee3a68..0b39d74 100644 --- a/specs/reliant-cds +++ b/specs/reliant-cds @@ -66,7 +66,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = CC -xar -o diff --git a/specs/reliant-cds-64 b/specs/reliant-cds-64 index da79224..7b48db2 100644 --- a/specs/reliant-cds-64 +++ b/specs/reliant-cds-64 @@ -66,7 +66,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -QMAKE_MOC = $(QTDIR)/bin/moc +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc QMAKE_UIC = $(QTDIR)/bin/uic QMAKE_AR = CC -xar -o diff --git a/specs/sco-cc b/specs/sco-cc index 8a4a392..330cbff 100644 --- a/specs/sco-cc +++ b/specs/sco-cc @@ -60,7 +60,7 @@ QMAKE_LIBS_X11SM = -lSM -lICE QMAKE_LIBS_OPENGL = -lGLU -lGL -lXt QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/sco-g++ b/specs/sco-g++ index 9a488e8..9895b29 100644 --- a/specs/sco-g++ +++ b/specs/sco-g++ @@ -59,7 +59,7 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lsocket -lm QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/solaris-cc b/specs/solaris-cc index 3e1f428..08b14a6 100644 --- a/specs/solaris-cc +++ b/specs/solaris-cc @@ -65,7 +65,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -lrt QMAKE_LIBS_NETWORK = -lresolv -lsocket -lxnet -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = CC -xar -o diff --git a/specs/solaris-cc-64 b/specs/solaris-cc-64 index cd1af17..1b7ffc1 100644 --- a/specs/solaris-cc-64 +++ b/specs/solaris-cc-64 @@ -82,7 +82,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -lrt QMAKE_LIBS_NETWORK = -lresolv -lsocket -lxnet -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = CC -xar -o diff --git a/specs/solaris-g++ b/specs/solaris-g++ index 09d141d..2d8f170 100644 --- a/specs/solaris-g++ +++ b/specs/solaris-g++ @@ -69,7 +69,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -lrt QMAKE_LIBS_NETWORK = -lresolv -lsocket -lxnet -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/solaris-g++-64 b/specs/solaris-g++-64 index c85882a..a3e6f0d 100644 --- a/specs/solaris-g++-64 +++ b/specs/solaris-g++-64 @@ -86,7 +86,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -lrt QMAKE_LIBS_NETWORK = -lresolv -lsocket -lxnet -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/tru64-cxx b/specs/tru64-cxx index b7154be..febaf98 100644 --- a/specs/tru64-cxx +++ b/specs/tru64-cxx @@ -61,7 +61,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lrt -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/tru64-g++ b/specs/tru64-g++ index eb3a758..2c6673b 100644 --- a/specs/tru64-g++ +++ b/specs/tru64-g++ @@ -61,7 +61,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthread -lexc -lrt -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cqs diff --git a/specs/unixware-cc b/specs/unixware-cc index 61b0d7f..0e08a27 100644 --- a/specs/unixware-cc +++ b/specs/unixware-cc @@ -66,7 +66,7 @@ QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/unixware-g++ b/specs/unixware-g++ index cd7735e..75f9fa6 100644 --- a/specs/unixware-g++ +++ b/specs/unixware-g++ @@ -63,7 +63,7 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXt QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lthread -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc +QMAKE_TQMOC = $$[QT_INSTALL_BINS]/tqmoc QMAKE_UIC = $$[QT_INSTALL_BINS]/uic QMAKE_AR = ar cq diff --git a/specs/win32-borland b/specs/win32-borland index 63bf07a..49e50e6 100644 --- a/specs/win32-borland +++ b/specs/win32-borland @@ -69,7 +69,7 @@ QMAKE_LIBS_QT_ENTRY = -lqtmain #QMAKE_LIBS_OPENGL = #QMAKE_LFLAGS_OPENGL = /dopengl32.dll -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-g++ b/specs/win32-g++ index 0c45103..1e2d259 100644 --- a/specs/win32-g++ +++ b/specs/win32-g++ @@ -86,7 +86,7 @@ isEqual(MINGW_IN_SHELL, 1) { QMAKE_MKDIR = mkdir QMAKE_DEL_DIR = rmdir } -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe diff --git a/specs/win32-icc b/specs/win32-icc index ca00e9e..362c020 100644 --- a/specs/win32-icc +++ b/specs/win32-icc @@ -65,7 +65,7 @@ QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib gdi32.lib user32.lib delayimp.l QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib QMAKE_LIBS_QT_ENTRY = -lqtmain -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-msvc b/specs/win32-msvc index 2332b6b..49adddd 100644 --- a/specs/win32-msvc +++ b/specs/win32-msvc @@ -64,7 +64,7 @@ QMAKE_LIBS_OPENGL = opengl32.lib glu32.lib gdi32.lib user32.lib delayimp.l QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib QMAKE_LIBS_QT_ENTRY = -lqtmain -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-msvc.net b/specs/win32-msvc.net index 5fbb756..8989502 100644 --- a/specs/win32-msvc.net +++ b/specs/win32-msvc.net @@ -64,7 +64,7 @@ QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32 QMAKE_LIBS_QT_ENTRY = -lqtmain -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-msvc2005 b/specs/win32-msvc2005 index 4c9bc38..d152e07 100644 --- a/specs/win32-msvc2005 +++ b/specs/win32-msvc2005 @@ -64,7 +64,7 @@ QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32 QMAKE_LIBS_QT_ENTRY = -lqtmain -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-msvc2008 b/specs/win32-msvc2008 index c7f2499..caaebf6 100644 --- a/specs/win32-msvc2008 +++ b/specs/win32-msvc2008 @@ -64,7 +64,7 @@ QMAKE_LIBS_COMPAT = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32 QMAKE_LIBS_QT_ENTRY = -lqtmain -QMAKE_MOC = $$[QT_INSTALL_BINS]\moc.exe +QMAKE_TQMOC = $$[QT_INSTALL_BINS]\tqmoc.exe QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe QMAKE_IDC = $$[QT_INSTALL_BINS]\idc.exe diff --git a/specs/win32-watcom b/specs/win32-watcom index 35bde44..6cc20ac 100644 --- a/specs/win32-watcom +++ b/specs/win32-watcom @@ -52,7 +52,7 @@ QMAKE_LIBS_QT_ENTRY = %QTDIR%\lib\qtmain.lib QMAKE_LIBS_OPENGL = opengl32.lib -QMAKE_MOC = $(QTDIR)/bin/moc.exe +QMAKE_TQMOC = $(QTDIR)/bin/tqmoc.exe QMAKE_UIC = $(QTDIR)/bin/uic.exe QMAKE_IDC = $(QTDIR)/bin/idc.exe diff --git a/sphinx/annotations.rst b/sphinx/annotations.rst index 05ab847..d43955a 100644 --- a/sphinx/annotations.rst +++ b/sphinx/annotations.rst @@ -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/sphinx/c_api.rst b/sphinx/c_api.rst index 782056c..7bcacc7 100644 --- a/sphinx/c_api.rst +++ b/sphinx/c_api.rst @@ -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/sphinx/directives.rst b/sphinx/directives.rst index 7e3a2e0..7c1a064 100644 --- a/sphinx/directives.rst +++ b/sphinx/directives.rst @@ -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/sphinx/introduction.rst b/sphinx/introduction.rst index 8515243..8488b6f 100644 --- a/sphinx/introduction.rst +++ b/sphinx/introduction.rst @@ -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/sphinx/specification_files.rst b/sphinx/specification_files.rst index 6ba3aba..ff352f4 100644 --- a/sphinx/specification_files.rst +++ b/sphinx/specification_files.rst @@ -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/sphinx/using.rst b/sphinx/using.rst index ff121ce..99fd389 100644 --- a/sphinx/using.rst +++ b/sphinx/using.rst @@ -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. |