summaryrefslogtreecommitdiffstats
path: root/siplib
diff options
context:
space:
mode:
Diffstat (limited to 'siplib')
-rw-r--r--siplib/sip-tqt.h46
-rw-r--r--siplib/siplib.c18
-rw-r--r--siplib/tqtlib.c36
3 files changed, 50 insertions, 50 deletions
diff --git a/siplib/sip-tqt.h b/siplib/sip-tqt.h
index 7fb0bb5..f8fc861 100644
--- a/siplib/sip-tqt.h
+++ b/siplib/sip-tqt.h
@@ -856,7 +856,7 @@ typedef struct _sipExportedModuleDef {
sipImportedModuleDef *em_imports;
/* The optional TQt support API. */
- struct _sipTQtAPI *em_qt_api;
+ struct _sipTQtAPI *em_tqt_api;
/* The number of types. */
int em_nrtypes;
@@ -1298,22 +1298,22 @@ typedef struct _sipAPIDef {
* The API implementing the optional TQt support.
*/
typedef struct _sipTQtAPI {
- sipTypeDef **qt_qobject;
- void *(*qt_create_universal_signal)(void *, const char **);
- void *(*qt_find_universal_signal)(void *, const char **);
- void *(*qt_create_universal_slot)(struct _sipWrapper *, const char *,
+ sipTypeDef **tqt_tqobject;
+ void *(*tqt_create_universal_signal)(void *, const char **);
+ void *(*tqt_find_universal_signal)(void *, const char **);
+ void *(*tqt_create_universal_slot)(struct _sipWrapper *, const char *,
PyObject *, const char *, const char **, int);
- void (*qt_destroy_universal_slot)(void *);
- void *(*qt_find_slot)(void *, const char *, PyObject *, const char *,
+ void (*tqt_destroy_universal_slot)(void *);
+ void *(*tqt_find_slot)(void *, const char *, PyObject *, const char *,
const char **);
- int (*qt_connect)(void *, const char *, void *, const char *, int);
- int (*qt_disconnect)(void *, const char *, void *, const char *);
- int (*qt_same_name)(const char *, const char *);
- sipSlot *(*qt_find_sipslot)(void *, void **);
+ int (*tqt_connect)(void *, const char *, void *, const char *, int);
+ int (*tqt_disconnect)(void *, const char *, void *, const char *);
+ int (*tqt_same_name)(const char *, const char *);
+ sipSlot *(*tqt_find_sipslot)(void *, void **);
int (*tqt_emit_signal)(PyObject *, const char *, PyObject *);
- int (*qt_connect_py_signal)(PyObject *, const char *, PyObject *,
+ int (*tqt_connect_py_signal)(PyObject *, const char *, PyObject *,
const char *);
- void (*qt_disconnect_py_signal)(PyObject *, const char *, PyObject *,
+ void (*tqt_disconnect_py_signal)(PyObject *, const char *, PyObject *,
const char *);
} sipTQtAPI;
@@ -1420,29 +1420,29 @@ typedef struct _sipTQtAPI {
/*
- * The following are PyTQt3-specific extensions. In SIP-TQt v5 they will be pushed
- * out to a plugin supplied by PyTQt3.
+ * The following are PyTQt-specific extensions. In SIP-TQt v5 they will be pushed
+ * out to a plugin supplied by PyTQt.
*/
-typedef int (*pyqt3EmitFunc)(sipSimpleWrapper *, PyObject *);
+typedef int (*pytqtEmitFunc)(sipSimpleWrapper *, PyObject *);
/*
* Maps the name of a TQt signal to a wrapper function to emit it.
*/
-typedef struct _pyqt3QtSignal {
+typedef struct _pytqtTQtSignal {
/* The signal name. */
const char *st_name;
/* The emitter function. */
- pyqt3EmitFunc st_emitfunc;
-} pyqt3QtSignal;
+ pytqtEmitFunc st_emitfunc;
+} pytqtTQtSignal;
/*
- * This is the PyTQt3-specific extension to the generated class type structure.
+ * This is the PyTQt-specific extension to the generated class type structure.
*/
-typedef struct _pyqt3ClassTypeDef {
+typedef struct _pytqtClassTypeDef {
/*
* The super-type structure. This must be first in the structure so that
* it can be cast to sipClassTypeDef *.
@@ -1450,8 +1450,8 @@ typedef struct _pyqt3ClassTypeDef {
sipClassTypeDef super;
/* The emit table for TQt signals. */
- pyqt3QtSignal *qt3_emit;
-} pyqt3ClassTypeDef;
+ pytqtTQtSignal *tqt_emit;
+} pytqtClassTypeDef;
/*
diff --git a/siplib/siplib.c b/siplib/siplib.c
index ea9bbd1..d90970c 100644
--- a/siplib/siplib.c
+++ b/siplib/siplib.c
@@ -1221,7 +1221,7 @@ static int sip_api_export_module(sipExportedModuleDef *client,
}
/* Only one module can claim to wrap TQObject. */
- if (em->em_qt_api != NULL && client->em_qt_api != NULL)
+ if (em->em_tqt_api != NULL && client->em_tqt_api != NULL)
{
PyErr_Format(PyExc_RuntimeError,
"the %s and %s modules both wrap the TQObject class",
@@ -1369,10 +1369,10 @@ static int sip_api_init_module(sipExportedModuleDef *client,
}
/* Set any TQt support API. */
- if (client->em_qt_api != NULL)
+ if (client->em_tqt_api != NULL)
{
- sipTQtSupport = client->em_qt_api;
- sipTQObjectType = *sipTQtSupport->qt_qobject;
+ sipTQtSupport = client->em_tqt_api;
+ sipTQObjectType = *sipTQtSupport->tqt_tqobject;
}
/* Append any initialiser extenders to the relevant classes. */
@@ -7045,7 +7045,7 @@ void *sip_api_get_address(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 PyTQt3 signal emitter
+ * pointer is a bug. However this is only ever called by PyTQt signal emitter
* code and PyTQt doesn't contain anything that multiply inherits from TQObject.
*/
static void *sip_api_get_complex_cpp_ptr(sipSimpleWrapper *sw)
@@ -8778,7 +8778,7 @@ static int sipWrapper_clear(sipWrapper *self)
sipSlot *slot;
void *context = NULL;
- while ((slot = sipTQtSupport->qt_find_sipslot(tx, &context)) != NULL)
+ while ((slot = sipTQtSupport->tqt_find_sipslot(tx, &context)) != NULL)
{
sip_api_clear_any_slot_reference(slot);
@@ -8846,7 +8846,7 @@ static int sipWrapper_traverse(sipWrapper *self, visitproc visit, void *arg)
sipSlot *slot;
void *context = NULL;
- while ((slot = sipTQtSupport->qt_find_sipslot(tx, &context)) != NULL)
+ while ((slot = sipTQtSupport->tqt_find_sipslot(tx, &context)) != NULL)
{
if ((vret = sip_api_visit_slot(slot, visit, arg)) != 0)
return vret;
@@ -9297,7 +9297,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 PyTQt3.
+ * is only called externally by PyTQt.
*/
static int sip_api_visit_slot(sipSlot *slot, visitproc visit, void *arg)
{
@@ -9311,7 +9311,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 PyTQt3.
+ * called externally by PyTQt.
*/
static void sip_api_clear_any_slot_reference(sipSlot *slot)
{
diff --git a/siplib/tqtlib.c b/siplib/tqtlib.c
index 702b679..7b8bb67 100644
--- a/siplib/tqtlib.c
+++ b/siplib/tqtlib.c
@@ -44,8 +44,8 @@ static void *newSignal(void *txrx, const char **sig);
*/
static void *findSignal(void *txrx, const char **sig)
{
- if (sipTQtSupport->qt_find_universal_signal != NULL)
- txrx = sipTQtSupport->qt_find_universal_signal(txrx, sig);
+ if (sipTQtSupport->tqt_find_universal_signal != NULL)
+ txrx = sipTQtSupport->tqt_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 && sipTQtSupport->qt_create_universal_signal != NULL)
- new_txrx = sipTQtSupport->qt_create_universal_signal(txrx, sig);
+ if (new_txrx == NULL && sipTQtSupport->tqt_create_universal_signal != NULL)
+ new_txrx = sipTQtSupport->tqt_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 = sipTQtSupport->qt_create_universal_slot(txSelf, sig, rxObj, slot,
+ void *us = sipTQtSupport->tqt_create_universal_slot(txSelf, sig, rxObj, slot,
member, flags);
if (us && txSelf)
@@ -92,7 +92,7 @@ PyObject *sip_api_invoke_slot(const sipSlot *slot, PyObject *sigargs)
/* Keep some compilers quiet. */
oxtype = oxvalue = oxtb = NULL;
- /* Fan out TQt signals. (Only PyTQt3 will do this.) */
+ /* Fan out TQt signals. (Only PyTQt will do this.) */
if (slot->name != NULL && slot->name[0] != '\0')
{
assert(sipTQtSupport->tqt_emit_signal);
@@ -309,7 +309,7 @@ int sip_api_same_slot(const sipSlot *sp, PyObject *rxObj, const char *slot)
if (sp->name == NULL || sp->name[0] == '\0')
return 0;
- return (sipTQtSupport->qt_same_name(sp->name, slot) && sp->pyobj == rxObj);
+ return (sipTQtSupport->tqt_same_name(sp->name, slot) && sp->pyobj == rxObj);
}
/* See if they are pure Python methods. */
@@ -361,10 +361,10 @@ void *sipGetRx(sipSimpleWrapper *txSelf, const char *sigargs, PyObject *rxObj,
}
/*
- * The slot was either a Python callable or PyTQt3 Python signal so there
+ * The slot was either a Python callable or PyTQt Python signal so there
* should be a universal slot.
*/
- return sipTQtSupport->qt_find_slot(sip_api_get_address(txSelf), sigargs, rxObj, slot, memberp);
+ return sipTQtSupport->tqt_find_slot(sip_api_get_address(txSelf), sigargs, rxObj, slot, memberp);
}
@@ -424,15 +424,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 = sipTQtSupport->qt_connect(tx, real_sig, rx, member, type);
+ res = sipTQtSupport->tqt_connect(tx, real_sig, rx, member, type);
return PyBool_FromLong(res);
}
- /* Handle Python signals. Only PyTQt3 will get this far. */
- assert(sipTQtSupport->qt_connect_py_signal);
+ /* Handle Python signals. Only PyTQt will get this far. */
+ assert(sipTQtSupport->tqt_connect_py_signal);
- if (sipTQtSupport->qt_connect_py_signal(txObj, sig, rxObj, slot) < 0)
+ if (sipTQtSupport->tqt_connect_py_signal(txObj, sig, rxObj, slot) < 0)
return NULL;
Py_INCREF(Py_True);
@@ -466,22 +466,22 @@ PyObject *sip_api_disconnect_rx(PyObject *txObj,const char *sig,
/* Handle Python signals. */
tx = findSignal(tx, &sig);
- res = sipTQtSupport->qt_disconnect(tx, sig, rx, member);
+ res = sipTQtSupport->tqt_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.
*/
- sipTQtSupport->qt_destroy_universal_slot(rx);
+ sipTQtSupport->tqt_destroy_universal_slot(rx);
return PyBool_FromLong(res);
}
- /* Handle Python signals. Only PyTQt3 will get this far. */
- assert(sipTQtSupport->qt_disconnect_py_signal);
+ /* Handle Python signals. Only PyTQt will get this far. */
+ assert(sipTQtSupport->tqt_disconnect_py_signal);
- sipTQtSupport->qt_disconnect_py_signal(txObj, sig, rxObj, slot);
+ sipTQtSupport->tqt_disconnect_py_signal(txObj, sig, rxObj, slot);
Py_INCREF(Py_True);
return Py_True;
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-29 03:26:15 +0000