summaryrefslogtreecommitdiffstats
path: root/python/sip/sipgen
diff options
context:
space:
mode:
Diffstat (limited to 'python/sip/sipgen')
-rw-r--r--python/sip/sipgen/export.c12
-rw-r--r--python/sip/sipgen/gencode.c20
-rw-r--r--python/sip/sipgen/parser.c12
-rw-r--r--python/sip/sipgen/parser.h12
-rw-r--r--python/sip/sipgen/sip.h4
-rw-r--r--python/sip/sipgen/transform.c10
6 files changed, 35 insertions, 35 deletions
diff --git a/python/sip/sipgen/export.c b/python/sip/sipgen/export.c
index a6e62523..5200b2cf 100644
--- a/python/sip/sipgen/export.c
+++ b/python/sip/sipgen/export.c
@@ -791,7 +791,7 @@ static void xmlType(argDef *ad, int sec, FILE *fp)
{
int a;
- prcode(fp, "SLOT(");
+ prcode(fp, "TQT_SLOT(");
for (a = 0; a < ad->u.sa->nrArgs; ++a)
{
@@ -892,11 +892,11 @@ static const char *pyType(argDef *ad, int sec, classDef **scope)
break;
case signal_type:
- type_name = "SIGNAL()";
+ type_name = "TQT_SIGNAL()";
break;
case slot_type:
- type_name = "SLOT()";
+ type_name = "TQT_SLOT()";
break;
case rxcon_type:
@@ -904,12 +904,12 @@ static const char *pyType(argDef *ad, int sec, classDef **scope)
if (sec)
type_name = "callable";
else
- type_name = "QObject";
+ type_name = "TQObject";
break;
case qobject_type:
- type_name = "QObject";
+ type_name = "TQObject";
break;
case ustring_type:
@@ -987,7 +987,7 @@ static const char *pyType(argDef *ad, int sec, classDef **scope)
case anyslot_type:
/* Need to check if this is enough. */
- type_name = "SLOT()";
+ type_name = "TQT_SLOT()";
break;
default:
diff --git a/python/sip/sipgen/gencode.c b/python/sip/sipgen/gencode.c
index b23ee2b1..ff1b93b9 100644
--- a/python/sip/sipgen/gencode.c
+++ b/python/sip/sipgen/gencode.c
@@ -649,10 +649,10 @@ static void generateInternalAPIHeader(sipSpec *pt,char *codeDir,stringList *xsl)
if (optQ_OBJECT4(pt))
prcode(fp,
"\n"
-"typedef const QMetaObject *(*sip_qt_metaobject_func)(sipWrapper *,sipWrapperType *,const QMetaObject *);\n"
+"typedef const TQMetaObject *(*sip_qt_metaobject_func)(sipWrapper *,sipWrapperType *,const TQMetaObject *);\n"
"extern sip_qt_metaobject_func sip_%s_qt_metaobject;\n"
"\n"
-"typedef int (*sip_qt_metacall_func)(sipWrapper *,sipWrapperType *,QMetaObject::Call,int,void **);\n"
+"typedef int (*sip_qt_metacall_func)(sipWrapper *,sipWrapperType *,TQMetaObject::Call,int,void **);\n"
"extern sip_qt_metacall_func sip_%s_qt_metacall;\n"
, mname
, mname);
@@ -4730,12 +4730,12 @@ static void generateShadowCode(sipSpec *pt,classDef *cd,FILE *fp)
{
prcode(fp,
"\n"
-"const QMetaObject *sip%C::metaObject() const\n"
+"const TQMetaObject *sip%C::metaObject() const\n"
"{\n"
" return sip_%s_qt_metaobject(sipPySelf,sipClass_%C,%S::metaObject());\n"
"}\n"
"\n"
-"int sip%C::qt_metacall(QMetaObject::Call _c,int _id,void **_a)\n"
+"int sip%C::qt_metacall(TQMetaObject::Call _c,int _id,void **_a)\n"
"{\n"
" sip%C::metaObject();\n"
"\n"
@@ -6623,8 +6623,8 @@ static void generateShadowClassDeclaration(sipSpec *pt,classDef *cd,FILE *fp)
if (isQObjectSubClass(cd) && optQ_OBJECT4(pt))
prcode(fp,
"\n"
-" const QMetaObject *metaObject() const;\n"
-" int qt_metacall(QMetaObject::Call,int,void **);\n"
+" const TQMetaObject *metaObject() const;\n"
+" int qt_metacall(TQMetaObject::Call,int,void **);\n"
);
/* The exposure of protected enums. */
@@ -7033,7 +7033,7 @@ static void generateNamedBaseType(argDef *ad,char *name,FILE *fp)
case rxcon_type:
case rxdis_type:
nr_derefs = 1;
- prcode(fp,"QObject");
+ prcode(fp,"TQObject");
break;
case mapped_type:
@@ -7865,13 +7865,13 @@ static void generateRegisterMetaType(classDef *cd, FILE *fp)
if (classFQCName(cd)->next == NULL)
{
- if (strcmp(classBaseName(cd), "QChar") == 0)
+ if (strcmp(classBaseName(cd), "TQChar") == 0)
return;
- if (strcmp(classBaseName(cd), "QString") == 0)
+ if (strcmp(classBaseName(cd), "TQString") == 0)
return;
- if (strcmp(classBaseName(cd), "QByteArray") == 0)
+ if (strcmp(classBaseName(cd), "TQByteArray") == 0)
return;
}
diff --git a/python/sip/sipgen/parser.c b/python/sip/sipgen/parser.c
index bca393aa..04a72f68 100644
--- a/python/sip/sipgen/parser.c
+++ b/python/sip/sipgen/parser.c
@@ -125,9 +125,9 @@
TK_LOGICAL_OR = 327,
TK_CONST = 328,
TK_STATIC = 329,
- TK_SIPSIGNAL = 330,
- TK_SIPSLOT = 331,
- TK_SIPANYSLOT = 332,
+ TK_SIPQT_SIGNAL = 330,
+ TK_SIPQT_SLOT = 331,
+ TK_SIPANYQT_SLOT = 332,
TK_SIPRXCON = 333,
TK_SIPRXDIS = 334,
TK_SIPSLOTCON = 335,
@@ -226,9 +226,9 @@
#define TK_LOGICAL_OR 327
#define TK_CONST 328
#define TK_STATIC 329
-#define TK_SIPSIGNAL 330
-#define TK_SIPSLOT 331
-#define TK_SIPANYSLOT 332
+#define TK_SIPQT_SIGNAL 330
+#define TK_SIPQT_SLOT 331
+#define TK_SIPANYQT_SLOT 332
#define TK_SIPRXCON 333
#define TK_SIPRXDIS 334
#define TK_SIPSLOTCON 335
diff --git a/python/sip/sipgen/parser.h b/python/sip/sipgen/parser.h
index 72165974..7a75072d 100644
--- a/python/sip/sipgen/parser.h
+++ b/python/sip/sipgen/parser.h
@@ -101,9 +101,9 @@
TK_LOGICAL_OR = 327,
TK_CONST = 328,
TK_STATIC = 329,
- TK_SIPSIGNAL = 330,
- TK_SIPSLOT = 331,
- TK_SIPANYSLOT = 332,
+ TK_SIPQT_SIGNAL = 330,
+ TK_SIPQT_SLOT = 331,
+ TK_SIPANYQT_SLOT = 332,
TK_SIPRXCON = 333,
TK_SIPRXDIS = 334,
TK_SIPSLOTCON = 335,
@@ -202,9 +202,9 @@
#define TK_LOGICAL_OR 327
#define TK_CONST 328
#define TK_STATIC 329
-#define TK_SIPSIGNAL 330
-#define TK_SIPSLOT 331
-#define TK_SIPANYSLOT 332
+#define TK_SIPQT_SIGNAL 330
+#define TK_SIPQT_SLOT 331
+#define TK_SIPANYQT_SLOT 332
#define TK_SIPRXCON 333
#define TK_SIPRXDIS 334
#define TK_SIPSLOTCON 335
diff --git a/python/sip/sipgen/sip.h b/python/sip/sipgen/sip.h
index f7fa46c3..a259a6dc 100644
--- a/python/sip/sipgen/sip.h
+++ b/python/sip/sipgen/sip.h
@@ -79,7 +79,7 @@
#define CLASS_IS_EXTERNAL 0x00100000 /* It is external. */
#define CLASS_IS_DELAYED_DTOR 0x00200000 /* The dtor is delayed. */
#define CLASS_NO_DEFAULT_CTORS 0x00400000 /* Don't create default ctors. */
-#define CLASS_QOBJECT_SUB 0x00800000 /* It is derived from QObject. */
+#define CLASS_QOBJECT_SUB 0x00800000 /* It is derived from TQObject. */
#define CLASS_DTOR_HOLD_GIL 0x01000000 /* The dtor holds the GIL. */
#define hasEnums(cd) ((cd)->classflags & CLASS_HAS_ENUMS)
@@ -908,7 +908,7 @@ typedef struct {
exceptionDef *exceptions; /* The list of exceptions. */
mappedTypeDef *mappedtypes; /* The mapped types. */
mappedTypeTmplDef *mappedtypetemplates; /* The list of mapped type templates. */
- int qobjclass; /* QObject class, -1 if none. */
+ int qobjclass; /* TQObject class, -1 if none. */
enumDef *enums; /* List of enums. */
varDef *vars; /* List of variables. */
memberDef *othfuncs; /* List of other functions. */
diff --git a/python/sip/sipgen/transform.c b/python/sip/sipgen/transform.c
index 036a124b..d19fb719 100644
--- a/python/sip/sipgen/transform.c
+++ b/python/sip/sipgen/transform.c
@@ -111,10 +111,10 @@ void transform(sipSpec *pt)
rev = cd;
/*
- * Mark any QObject class. This flag will ripple through all derived
+ * Mark any TQObject class. This flag will ripple through all derived
* classes when we set the hierarchy.
*/
- if (strcmp(classBaseName(cd), "QObject") == 0)
+ if (strcmp(classBaseName(cd), "TQObject") == 0)
setIsQObjectSubClass(cd);
cd = next;
@@ -842,7 +842,7 @@ static void setHierarchy(sipSpec *pt,classDef *base,classDef *cd,
appendToMRO(cd -> mro,&tailp,mro -> cd);
/*
- * If the super-class is a QObject sub-class then this one is
+ * If the super-class is a TQObject sub-class then this one is
* as well.
*/
if (isQObjectSubClass(mro->cd))
@@ -2830,10 +2830,10 @@ static void assignClassNrs(sipSpec *pt,moduleDef *mod,nodeDef *nd)
cd -> classnr = mod -> nrclasses++;
/*
- * If we find a class defined in the main module called QObject, assume
+ * If we find a class defined in the main module called TQObject, assume
* it's Qt.
*/
- if (mod == pt -> module && strcmp(classBaseName(cd),"QObject") == 0)
+ if (mod == pt -> module && strcmp(classBaseName(cd),"TQObject") == 0)
pt -> qobjclass = cd -> classnr;
}