summaryrefslogtreecommitdiffstats
path: root/sipgen/parser.y
diff options
context:
space:
mode:
Diffstat (limited to 'sipgen/parser.y')
-rw-r--r--sipgen/parser.y52
1 files changed, 26 insertions, 26 deletions
diff --git a/sipgen/parser.y b/sipgen/parser.y
index 08521e8..2991f82 100644
--- a/sipgen/parser.y
+++ b/sipgen/parser.y
@@ -1772,7 +1772,7 @@ classline: ifstart
}
| TK_SIGNALS ':' {
if (currentSpec -> genc)
- yyerror("Q_SIGNALS section not allowed in a C module");
+ yyerror("signals section not allowed in a C module");
if (notSkipping())
sectionFlags = SECT_IS_SIGNAL;
@@ -2288,7 +2288,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.name = cacheName(currentSpec, $2);
$$.defval = $4;
- currentSpec -> sigQ_SLOTS = TRUE;
+ currentSpec -> sigslots = TRUE;
}
| TK_SIPSLOT optname optflags optassign {
$$.atype = slot_type;
@@ -2297,7 +2297,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.name = cacheName(currentSpec, $2);
$$.defval = $4;
- currentSpec -> sigQ_SLOTS = TRUE;
+ currentSpec -> sigslots = TRUE;
}
| TK_SIPANYSLOT optname optflags optassign {
$$.atype = anyslot_type;
@@ -2306,7 +2306,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.name = cacheName(currentSpec, $2);
$$.defval = $4;
- currentSpec -> sigQ_SLOTS = TRUE;
+ currentSpec -> sigslots = TRUE;
}
| TK_SIPRXCON optname optflags {
$$.atype = rxcon_type;
@@ -2317,7 +2317,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
if (findOptFlag(&$3, "SingleShot", bool_flag) != NULL)
$$.argflags |= ARG_SINGLE_SHOT;
- currentSpec -> sigQ_SLOTS = TRUE;
+ currentSpec -> sigslots = TRUE;
}
| TK_SIPRXDIS optname optflags {
$$.atype = rxdis_type;
@@ -2325,7 +2325,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.nrderefs = 0;
$$.name = cacheName(currentSpec, $2);
- currentSpec -> sigQ_SLOTS = TRUE;
+ currentSpec -> sigslots = TRUE;
}
| TK_SIPSLOTCON '(' arglist ')' optname optflags {
$$.atype = slotcon_type;
@@ -2339,7 +2339,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.u.sa = sipMalloc(sizeof (signatureDef));
*$$.u.sa = $3;
- currentSpec -> sigQ_SLOTS = TRUE;
+ currentSpec -> sigslots = TRUE;
}
| TK_SIPSLOTDIS '(' arglist ')' optname optflags {
$$.atype = slotdis_type;
@@ -2353,7 +2353,7 @@ argvalue: TK_SIPSIGNAL optname optflags optassign {
$$.u.sa = sipMalloc(sizeof (signatureDef));
*$$.u.sa = $3;
- currentSpec -> sigQ_SLOTS = TRUE;
+ currentSpec -> sigslots = TRUE;
}
| TK_QOBJECT optname optflags {
$$.atype = qobject_type;
@@ -2750,7 +2750,7 @@ void parse(sipSpec *spec, FILE *fp, char *filename, stringList *tsl,
spec->typedefs = NULL;
spec->exphdrcode = NULL;
spec->docs = NULL;
- spec->sigQ_SLOTS = FALSE;
+ spec->sigslots = FALSE;
spec->genc = -1;
spec->plugins = NULL;
@@ -3266,7 +3266,7 @@ static void finishClass(sipSpec *pt, moduleDef *mod, classDef *cd,
cd->pyqt4_flags = flg->fvalue.ival;
if (findOptFlag(of, "PyQt4NoQMetaObject", bool_flag) != NULL)
- setPyQt4NoQMetaObject(cd);
+ setPyTQt4NoTQMetaObject(cd);
if (isOpaque(cd))
{
@@ -3666,7 +3666,7 @@ static enumDef *newEnum(sipSpec *pt, moduleDef *mod, mappedTypeDef *mt_scope,
ed->next_alt = next_alt;
ed->module = mod;
ed->members = NULL;
- ed->Q_SLOTS = NULL;
+ ed->slots = NULL;
ed->overs = NULL;
ed->next = pt -> enums;
@@ -3959,7 +3959,7 @@ static void instantiateClassTemplate(sipSpec *pt, moduleDef *mod,
ifaceFileList *iffl, **used;
type_names = type_values = NULL;
- appendTypeStrings(classFQCName(tcd->cd), &tcd->sig, &td->types, NULL, &type_names, &type_values);
+ appendTypeStrings(classFTQCName(tcd->cd), &tcd->sig, &td->types, NULL, &type_names, &type_values);
/*
* Add a mapping from the template name to the instantiated name. If we
@@ -3968,9 +3968,9 @@ static void instantiateClassTemplate(sipSpec *pt, moduleDef *mod,
ad = &tcd->sig.args[tcd->sig.nrArgs++];
memset(ad, 0, sizeof (argDef));
ad->atype = defined_type;
- ad->u.snd = classFQCName(tcd->cd);
+ ad->u.snd = classFTQCName(tcd->cd);
- appendScopedName(&type_names, text2scopePart(scopedNameTail(classFQCName(tcd->cd))));
+ appendScopedName(&type_names, text2scopePart(scopedNameTail(classFTQCName(tcd->cd))));
appendScopedName(&type_values, text2scopePart(scopedNameToString(fqname)));
/* Create the new class. */
@@ -4249,9 +4249,9 @@ static void instantiateTemplateEnums(sipSpec *pt, classTmplDef *tcd,
ed->members = emd;
}
- ed->Q_SLOTS = instantiateTemplateMethods(ted->Q_SLOTS, mod);
+ ed->slots = instantiateTemplateMethods(ted->slots, mod);
ed->overs = instantiateTemplateOverloads(pt, ted->overs,
- ted->Q_SLOTS, ed->Q_SLOTS, tcd, td, cd, used, type_names,
+ ted->slots, ed->slots, tcd, td, cd, used, type_names,
type_values);
ed->next = pt->enums;
@@ -4360,7 +4360,7 @@ static void templateType(argDef *ad, classTmplDef *tcd, templateDef *td, classDe
}
/* Handle the class name itself. */
- if (strcmp(name, scopedNameTail(classFQCName(tcd->cd))) == 0)
+ if (strcmp(name, scopedNameTail(classFTQCName(tcd->cd))) == 0)
{
ad->atype = class_type;
ad->u.cd = ncd;
@@ -4585,7 +4585,7 @@ static int foundInScope(scopedNameDef *fq_name, scopedNameDef *rel_name)
scopedNameDef *snd;
int found;
- snd = copyScopedName(classFQCName(scope));
+ snd = copyScopedName(classFTQCName(scope));
appendScopedName(&snd, copyScopedName(rel_name));
found = (compareScopedNames(fq_name, snd) == 0);
@@ -4969,16 +4969,16 @@ static void newFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope,
if (isSignal(od))
setHasShadow(c_scope);
- pt->sigQ_SLOTS = TRUE;
+ pt->sigslots = TRUE;
}
if (isSignal(od) && (methodcode != NULL || vcode != NULL))
- yyerror("Cannot provide code for Q_SIGNALS");
+ yyerror("Cannot provide code for signals");
if (isstatic)
{
if (isSignal(od))
- yyerror("Static functions cannot be Q_SIGNALS");
+ yyerror("Static functions cannot be signals");
if (isvirt)
yyerror("Static functions cannot be virtual");
@@ -5005,8 +5005,8 @@ static void newFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope,
if (isvirt)
{
- if (isSignal(od) && pluginPyQt3(pt))
- yyerror("Virtual Q_SIGNALS aren't supported");
+ if (isSignal(od) && pluginPyTQt3(pt))
+ yyerror("Virtual signals aren't supported");
setIsVirtual(od);
setHasShadow(c_scope);
@@ -5232,7 +5232,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope,
int nrargs; /* Nr. of arguments. */
} slot_table[] = {
{"__str__", str_slot, TRUE, 0},
- {"__tqunicode__", tqunicode_slot, TRUE, 0},
+ {"__unicode__", tqunicode_slot, TRUE, 0},
{"__int__", int_slot, FALSE, 0},
{"__long__", long_slot, FALSE, 0},
{"__float__", float_slot, FALSE, 0},
@@ -6062,7 +6062,7 @@ static const char *getDocValue(optFlags *optflgs)
/*
* Return TRUE if the PyQt3 plugin was specified.
*/
-int pluginPyQt3(sipSpec *pt)
+int pluginPyTQt3(sipSpec *pt)
{
return stringFind(pt->plugins, "PyQt3");
}
@@ -6071,7 +6071,7 @@ int pluginPyQt3(sipSpec *pt)
/*
* Return TRUE if the PyQt4 plugin was specified.
*/
-int pluginPyQt4(sipSpec *pt)
+int pluginPyTQt4(sipSpec *pt)
{
return stringFind(pt->plugins, "PyQt4");
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-09-20 08:28:50 +0000