summaryrefslogtreecommitdiffstats
path: root/sipgen
diff options
context:
space:
mode:
Diffstat (limited to 'sipgen')
-rw-r--r--sipgen/gencode.c6
-rw-r--r--sipgen/parser.c2
-rw-r--r--sipgen/parser.y2
-rw-r--r--sipgen/sip.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/sipgen/gencode.c b/sipgen/gencode.c
index bd9fc11..81ac1c8 100644
--- a/sipgen/gencode.c
+++ b/sipgen/gencode.c
@@ -639,8 +639,8 @@ static void generateInternalAPIHeader(sipSpec *pt, moduleDef *mod,
"#define sipString_AsLatin1String sipAPI_%s->api_string_as_latin1_string\n"
"#define sipString_AsUTF8Char sipAPI_%s->api_string_as_utf8_char\n"
"#define sipString_AsUTF8String sipAPI_%s->api_string_as_utf8_string\n"
-"#define sipUnicode_AsWChar sipAPI_%s->api_tqunicode_as_wchar\n"
-"#define sipUnicode_AsWString sipAPI_%s->api_tqunicode_as_wstring\n"
+"#define sipUnicode_AsWChar sipAPI_%s->api_unicode_as_wchar\n"
+"#define sipUnicode_AsWString sipAPI_%s->api_unicode_as_wstring\n"
"#define sipConvertFromConstVoidPtr sipAPI_%s->api_convert_from_const_void_ptr\n"
"#define sipConvertFromVoidPtrAndSize sipAPI_%s->api_convert_from_void_ptr_and_size\n"
"#define sipConvertFromConstVoidPtrAndSize sipAPI_%s->api_convert_from_const_void_ptr_and_size\n"
@@ -5335,7 +5335,7 @@ static void generateClassFunctions(sipSpec *pt, moduleDef *mod, classDef *cd,
for (md = cd->members; md != NULL; md = md->next)
if (cd->iff->type == namespace_iface)
generateOrdinaryFunction(pt, mod, cd, NULL, md, fp);
- else if (md->slot != no_slot && md->slot != tqunicode_slot)
+ else if (md->slot != no_slot && md->slot != unicode_slot)
generateSlot(mod, cd, NULL, md, fp);
if (cd->iff->type != namespace_iface && !generating_c)
diff --git a/sipgen/parser.c b/sipgen/parser.c
index e0de35e..77b67b5 100644
--- a/sipgen/parser.c
+++ b/sipgen/parser.c
@@ -8821,7 +8821,7 @@ static memberDef *findFunction(sipSpec *pt, moduleDef *mod, classDef *c_scope,
int nrargs; /* Nr. of arguments. */
} slot_table[] = {
{"__str__", str_slot, TRUE, 0},
- {"__unicode__", tqunicode_slot, TRUE, 0},
+ {"__unicode__", unicode_slot, TRUE, 0},
{"__int__", int_slot, FALSE, 0},
{"__long__", long_slot, FALSE, 0},
{"__float__", float_slot, FALSE, 0},
diff --git a/sipgen/parser.y b/sipgen/parser.y
index 2991f82..86885c3 100644
--- a/sipgen/parser.y
+++ b/sipgen/parser.y
@@ -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},
- {"__unicode__", tqunicode_slot, TRUE, 0},
+ {"__unicode__", unicode_slot, TRUE, 0},
{"__int__", int_slot, FALSE, 0},
{"__long__", long_slot, FALSE, 0},
{"__float__", float_slot, FALSE, 0},
diff --git a/sipgen/sip.h b/sipgen/sip.h
index ab2d17d..4a4910b 100644
--- a/sipgen/sip.h
+++ b/sipgen/sip.h
@@ -426,7 +426,7 @@
typedef enum {
str_slot,
- tqunicode_slot,
+ unicode_slot,
int_slot,
long_slot,
float_slot,