From c668d2b1b34ee856e70874159c42892a4c9c8af4 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 8 Jan 2024 11:54:36 +0900 Subject: [PATCH] Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit e44eaa6ec01b8a2a0844ecc960f843eca1c4f645) --- sipgen/export.c | 8 ++++---- siplib/tqtlib.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sipgen/export.c b/sipgen/export.c index a11de0a..3e7efed 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, "TQT_SLOT("); + prcode(fp, "TQ_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 = "TQT_SIGNAL()"; + type_name = "TQ_SIGNAL()"; break; case slot_type: - type_name = "TQT_SLOT()"; + type_name = "TQ_SLOT()"; break; case rxcon_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 = "TQT_SLOT()"; + type_name = "TQ_SLOT()"; break; default: diff --git a/siplib/tqtlib.c b/siplib/tqtlib.c index 7b8bb67..df35d6c 100644 --- a/siplib/tqtlib.c +++ b/siplib/tqtlib.c @@ -569,7 +569,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, TQT_SLOT('meth()')" rather than "obj.meth" (see below). + * at "obj, TQ_SLOT('meth()')" rather than "obj.meth" (see below). */ const char *meth; @@ -610,7 +610,7 @@ int sip_api_save_slot(sipSlot *sp, PyObject *rxObj, const char *slot) { /* * 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". + * specified the slot as "obj, TQ_SLOT('meth()')" rather than "obj.meth". */ char *tail;