summaryrefslogtreecommitdiffstats
path: root/sipgen/gencode.c
diff options
context:
space:
mode:
Diffstat (limited to 'sipgen/gencode.c')
-rw-r--r--sipgen/gencode.c72
1 files changed, 36 insertions, 36 deletions
diff --git a/sipgen/gencode.c b/sipgen/gencode.c
index 7d0dd63..7dbe6ad 100644
--- a/sipgen/gencode.c
+++ b/sipgen/gencode.c
@@ -802,14 +802,14 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
if (pluginPyQt4(pt))
prcode(fp,
"\n"
-"typedef const TQMetaObject *(*sip_qt_metaobject_func)(sipSimpleWrapper *,sipTypeDef *);\n"
-"extern sip_qt_metaobject_func sip_%s_qt_metaobject;\n"
+"typedef const TQMetaObject *(*sip_tqt_metaobject_func)(sipSimpleWrapper *,sipTypeDef *);\n"
+"extern sip_tqt_metaobject_func sip_%s_tqt_metaobject;\n"
"\n"
-"typedef int (*sip_qt_metacall_func)(sipSimpleWrapper *,sipTypeDef *,TQMetaObject::Call,int,void **);\n"
-"extern sip_qt_metacall_func sip_%s_qt_metacall;\n"
+"typedef int (*sip_tqt_metacall_func)(sipSimpleWrapper *,sipTypeDef *,TQMetaObject::Call,int,void **);\n"
+"extern sip_tqt_metacall_func sip_%s_tqt_metacall;\n"
"\n"
-"typedef int (*sip_qt_metacast_func)(sipSimpleWrapper *,sipTypeDef *,const char *);\n"
-"extern sip_qt_metacast_func sip_%s_qt_metacast;\n"
+"typedef int (*sip_tqt_metacast_func)(sipSimpleWrapper *,sipTypeDef *,const char *);\n"
+"extern sip_tqt_metacast_func sip_%s_tqt_metacast;\n"
, mname
, mname
, mname);
@@ -1164,7 +1164,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
* optional parts. These should be undefined in %ModuleCode if a C++
* implementation is provided.
*/
- if (mod->qobjclass >= 0)
+ if (mod->tqobjclass >= 0)
prcode(fp,
"\n"
"#define sipTQtCreateUniversalSignal 0\n"
@@ -1702,13 +1702,13 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
);
/* Generate any TQt support API. */
- if (mod->qobjclass >= 0)
+ if (mod->tqobjclass >= 0)
prcode(fp,
"\n"
"\n"
"/* This defines the TQt support API. */\n"
"\n"
-"static sipTQtAPI qtAPI = {\n"
+"static sipTQtAPI tqtAPI = {\n"
" &typesTable[%d],\n"
" sipTQtCreateUniversalSignal,\n"
" sipTQtFindUniversalSignal,\n"
@@ -1723,7 +1723,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
" sipTQtConnectPySignal,\n"
" sipTQtDisconnectPySignal\n"
"};\n"
- , mod->qobjclass);
+ , mod->tqobjclass);
prcode(fp,
"\n"
@@ -1762,7 +1762,7 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
, mod->version
, pt->module->name
, mod->allimports != NULL ? "importsTable" : "NULL"
- , mod->qobjclass >= 0 ? "&qtAPI" : "NULL"
+ , mod->tqobjclass >= 0 ? "&tqtAPI" : "NULL"
, mod->nrtypes
, mod->nrtypes > 0 ? "typesTable" : "NULL"
, hasexternal ? "externalTypesTable" : "NULL"
@@ -1806,9 +1806,9 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
if (pluginPyQt4(pt))
prcode(fp,
"\n"
-"sip_qt_metaobject_func sip_%s_qt_metaobject;\n"
-"sip_qt_metacall_func sip_%s_qt_metacall;\n"
-"sip_qt_metacast_func sip_%s_qt_metacast;\n"
+"sip_tqt_metaobject_func sip_%s_tqt_metaobject;\n"
+"sip_tqt_metacall_func sip_%s_tqt_metacall;\n"
+"sip_tqt_metacast_func sip_%s_tqt_metacast;\n"
, mname
, mname
, mname);
@@ -1907,9 +1907,9 @@ static void generateCpp(sipSpec *pt, moduleDef *mod, const char *codeDir,
/* Import the helpers. */
prcode(fp,
"\n"
-" sip_%s_qt_metaobject = (sip_qt_metaobject_func)sipImportSymbol(\"qtcore_qt_metaobject\");\n"
-" sip_%s_qt_metacall = (sip_qt_metacall_func)sipImportSymbol(\"qtcore_qt_metacall\");\n"
-" sip_%s_qt_metacast = (sip_qt_metacast_func)sipImportSymbol(\"qtcore_qt_metacast\");\n"
+" sip_%s_tqt_metaobject = (sip_tqt_metaobject_func)sipImportSymbol(\"tqtcore_tqt_metaobject\");\n"
+" sip_%s_tqt_metacall = (sip_tqt_metacall_func)sipImportSymbol(\"tqtcore_tqt_metacall\");\n"
+" sip_%s_tqt_metacast = (sip_tqt_metacast_func)sipImportSymbol(\"tqtcore_tqt_metacast\");\n"
"\n"
, mname
, mname
@@ -2037,7 +2037,7 @@ static void generateTypesTable(sipSpec *pt, moduleDef *mod, FILE *fp)
argDef *ad;
const char *type_suffix;
- type_suffix = (pluginPyQt4(pt) || pluginPyTQt3(pt)) ? ".super" : "";
+ type_suffix = (pluginPyQt4(pt) || pluginPyTQt(pt)) ? ".super" : "";
prcode(fp,
"\n"
@@ -3623,7 +3623,7 @@ static void generateTypeDefLink(sipSpec *pt, ifaceFileDef *iff, FILE *fp)
if (iff->next_alt->type == mappedtype_iface)
prcode(fp, ".mtd_base");
- else if (pluginPyTQt3(pt) || pluginPyQt4(pt))
+ else if (pluginPyTQt(pt) || pluginPyQt4(pt))
prcode(fp, ".super.ctd_base");
else
prcode(fp, ".ctd_base");
@@ -5703,7 +5703,7 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd,
"\n"
"const TQMetaObject *sip%C::metaObject() const\n"
"{\n"
-" return sip_%s_qt_metaobject(sipPySelf,sipType_%C);\n"
+" return sip_%s_tqt_metaobject(sipPySelf,sipType_%C);\n"
"}\n"
, classFTQCName(cd)
, mod->name, classFTQCName(cd));
@@ -5715,14 +5715,14 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd,
" _id = %S::qt_metacall(_c,_id,_a);\n"
"\n"
" if (_id >= 0)\n"
-" _id = sip_%s_qt_metacall(sipPySelf,sipType_%C,_c,_id,_a);\n"
+" _id = sip_%s_tqt_metacall(sipPySelf,sipType_%C,_c,_id,_a);\n"
"\n"
" return _id;\n"
"}\n"
"\n"
"void *sip%C::qt_metacast(const char *_clname)\n"
"{\n"
-" return (sip_%s_qt_metacast && sip_%s_qt_metacast(sipPySelf,sipType_%C,_clname)) ? this : %S::qt_metacast(_clname);\n"
+" return (sip_%s_tqt_metacast && sip_%s_tqt_metacast(sipPySelf,sipType_%C,_clname)) ? this : %S::qt_metacast(_clname);\n"
"}\n"
, classFTQCName(cd)
, classFTQCName(cd)
@@ -5762,7 +5762,7 @@ static void generateShadowCode(sipSpec *pt, moduleDef *mod, classDef *cd,
generateProtectedDefinitions(cd,fp);
/* Generate the emitters if needed. */
- if (pluginPyTQt3(pt))
+ if (pluginPyTQt(pt))
generateEmitters(cd, fp);
}
@@ -5804,7 +5804,7 @@ static void generateEmitters(classDef *cd, FILE *fp)
prcode(fp,
"\n"
-"static pyqt3QtSignal signals_%C[] = {\n"
+"static pytqtTQtSignal signals_%C[] = {\n"
,classFTQCName(cd));
noIntro = FALSE;
@@ -7344,7 +7344,7 @@ static void generateTupleBuilder(signatureDef *sd,FILE *fp)
case fake_void_type:
case rxcon_type:
case rxdis_type:
- case qobject_type:
+ case tqobject_type:
fmt = "D";
break;
@@ -7404,7 +7404,7 @@ static void generateTupleBuilder(signatureDef *sd,FILE *fp)
if (ad->atype == mapped_type || ad->atype == class_type ||
ad->atype == rxcon_type || ad->atype == rxdis_type ||
- ad->atype == qobject_type || ad->atype == fake_void_type)
+ ad->atype == tqobject_type || ad->atype == fake_void_type)
{
int copy = copyConstRefArg(ad);
@@ -7654,8 +7654,8 @@ static void generateClassAPI(classDef *cd, sipSpec *pt, FILE *fp)
if (pluginPyQt4(pt))
type_prefix = "pyqt4";
- else if (pluginPyTQt3(pt))
- type_prefix = "pyqt3";
+ else if (pluginPyTQt(pt))
+ type_prefix = "pytqt";
else
type_prefix = "sip";
@@ -7813,8 +7813,8 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp)
{
prcode(fp,
"\n"
-" int qt_metacall(TQMetaObject::Call,int,void **);\n"
-" void *qt_metacast(const char *);\n"
+" int tqt_metacall(TQMetaObject::Call,int,void **);\n"
+" void *tqt_metacast(const char *);\n"
);
if (!noPyQt4TQMetaObject(cd))
@@ -7832,7 +7832,7 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp)
generateProtectedDeclarations(cd,fp);
/* The public wrapper around each signal emitter. */
- if (pluginPyTQt3(pt))
+ if (pluginPyTQt(pt))
{
visibleList *vl;
@@ -8319,7 +8319,7 @@ static void generateNamedBaseType(ifaceFileDef *scope, argDef *ad, char *name,
case pycallable_type:
case pyslice_type:
case pytype_type:
- case qobject_type:
+ case tqobject_type:
case ellipsis_type:
prcode(fp, "PyObject *");
break;
@@ -8756,9 +8756,9 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
type_prefix = "pyqt4";
embedded = TRUE;
}
- else if (pluginPyTQt3(pt))
+ else if (pluginPyTQt(pt))
{
- type_prefix = "pyqt3";
+ type_prefix = "pytqt";
embedded = TRUE;
}
else
@@ -9096,7 +9096,7 @@ static void generateTypeDefinition(sipSpec *pt, classDef *cd, FILE *fp)
"},\n"
);
- if (pluginPyTQt3(pt))
+ if (pluginPyTQt(pt))
{
if (hasSigSlots(cd))
prcode(fp,
@@ -11799,7 +11799,7 @@ static int generateArgParser(signatureDef *sd, classDef *c_scope,
fmt = (isAllowNone(ad) ? "H" : "F");
break;
- case qobject_type:
+ case tqobject_type:
fmt = "R";
break;