1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
$NetBSD: patch-ad,v 1.3 2013/03/22 13:29:42 obache Exp $
* let to cast with appropriate type.
--- src/scim-python-lookup-table.cpp.orig 2008-07-11 04:16:15.000000000 +0000
+++ src/scim-python-lookup-table.cpp
@@ -86,7 +86,7 @@ PyLookupTable::py_set_candidate_labels (
#else
int usize = PyUnicode_GET_SIZE (items[i]);
gunichar *unistr = g_utf16_to_ucs4 (PyUnicode_AS_UNICODE (items[i]), usize, NULL, NULL, NULL);
- _labels.push_back (WideString ((wchar_t *)unistr));
+ _labels.push_back (WideString ((scim::ucs4_t *)unistr));
g_free (unistr);
#endif
}
@@ -518,7 +518,7 @@ PyLookupTable::py_append_candidate (PyLo
return NULL;
unistr = g_utf16_to_ucs4 (candidate, size, NULL, NULL, NULL);
- if (self->lookup_table.append_candidate (WideString ((wchar_t *)unistr),
+ if (self->lookup_table.append_candidate (WideString ((scim::ucs4_t *)unistr),
Attributes_FromTupleOrList (pAttrs)))
{
result = Py_True;
@@ -596,7 +596,7 @@ PyLookupTable::py_init (PyLookupTableObj
void
PyLookupTable::py_dealloc (PyLookupTableObject *self)
{
- self->lookup_table.~LookupTable ();
+ self->lookup_table.~PyLookupTable ();
((PyObject *)self)->ob_type->tp_free (self);
}
|
