diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-12 11:42:11 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-07-12 11:42:11 +0900 |
| commit | 566a2d4dc8fea5283e39e29717f7a93af9a59da1 (patch) | |
| tree | c8a6a1f2de5457a1ec1fbed16a98b59eaf0df57c | |
| parent | d768e91379d44b22260cddb3559c1e2243c3b1f5 (diff) | |
| download | sip4-tqt-566a2d4d.tar.gz sip4-tqt-566a2d4d.zip | |
Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | sipgen/export.c | 4 | ||||
| -rw-r--r-- | sipgen/gencode.c | 2 | ||||
| -rw-r--r-- | sipgen/transform.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sipgen/export.c b/sipgen/export.c index e9b4f5a..a11de0a 100644 --- a/sipgen/export.c +++ b/sipgen/export.c @@ -968,12 +968,12 @@ static const char *pyType(sipSpec *pt, argDef *ad, int sec, classDef **scope) if (sec) type_name = "callable"; else - type_name = TQOBJECT_OBJECT_NAME_STRING; + type_name = "TQObject"; break; case tqobject_type: - type_name = TQOBJECT_OBJECT_NAME_STRING; + type_name = "TQObject"; break; case ustring_type: diff --git a/sipgen/gencode.c b/sipgen/gencode.c index b0e3eb7..a34ac05 100644 --- a/sipgen/gencode.c +++ b/sipgen/gencode.c @@ -8174,7 +8174,7 @@ static void generateNamedBaseType(ifaceFileDef *scope, argDef *ad, char *name, case rxcon_type: case rxdis_type: nr_derefs = 1; - prcode(fp, TQOBJECT_OBJECT_NAME_STRING); + prcode(fp, "TQObject"); break; case mapped_type: diff --git a/sipgen/transform.c b/sipgen/transform.c index d88a7f0..2c836a7 100644 --- a/sipgen/transform.c +++ b/sipgen/transform.c @@ -121,7 +121,7 @@ void transform(sipSpec *pt) * Mark any TQObject class. This flag will ripple through all derived * classes when we set the hierarchy. */ - if (strcmp(classBaseName(cd), TQOBJECT_OBJECT_NAME_STRING) == 0) + if (strcmp(classBaseName(cd), "TQObject") == 0) setIsTQObjectSubClass(cd); cd = next; @@ -3405,7 +3405,7 @@ static void createSortedNumberedTypesTable(sipSpec *pt, moduleDef *mod) ad->u.cd->iff->ifacenr = i; /* If we find a class called TQObject, assume it's TQt. */ - if (strcmp(ad->name->text, TQOBJECT_OBJECT_NAME_STRING) == 0) + if (strcmp(ad->name->text, "TQObject") == 0) mod->tqobjclass = i; break; |