diff options
Diffstat (limited to 'siplib/sip.h')
| -rw-r--r-- | siplib/sip.h | 76 |
1 files changed, 38 insertions, 38 deletions
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; |