1
=== modified file 'debian/control'
2
--- debian/control	2013-11-07 16:07:36 +0000
3
+++ debian/control	2013-11-12 23:09:13 +0000
4
@@ -10,7 +10,7 @@
5
10
               libglib2.0-dev,
10
               libglib2.0-dev,
6
11
               libgsettings-qt-dev,
11
               libgsettings-qt-dev,
7
12
               libhunspell-dev,
12
               libhunspell-dev,
9
13
               libpinyin2-dev,
13
               libpinyin4-dev,
10
14
               libplatform-api1-dev,
14
               libplatform-api1-dev,
11
15
               libpresage-dev,
15
               libpresage-dev,
12
16
               libxml2-utils,
16
               libxml2-utils,
13
17
17
14
=== modified file 'src/lib/logic/pinyinadapter.cpp'
15
--- src/lib/logic/pinyinadapter.cpp	2013-08-19 20:44:22 +0000
16
+++ src/lib/logic/pinyinadapter.cpp	2013-11-12 23:09:13 +0000
17
@@ -57,8 +57,8 @@
18
57
    std::cout << std::endl;
57
    std::cout << std::endl;
19
58
#endif
58
#endif
20
59
59
23
60
    m_array = g_array_new(FALSE, FALSE, sizeof(lookup_candidate_t));
60
24
61
    pinyin_get_candidates(m_instance, 0, m_array);
61
    pinyin_guess_candidates(m_instance, 0);
25
62
62
26
63
    pinyin_guess_sentence(m_instance);
63
    pinyin_guess_sentence(m_instance);
27
64
64
28
@@ -66,16 +66,20 @@
29
66
    pinyin_get_sentence(m_instance, &sentence);
66
    pinyin_get_sentence(m_instance, &sentence);
30
67
67
31
68
    candidates.clear();
68
    candidates.clear();
33
69
    for (unsigned int i = 0 ; i < m_array->len; i ++ )
69
    guint len = 0;
34
70
    pinyin_get_n_candidate(m_instance, &len);
35
71
    for (unsigned int i = 0 ; i < len; i ++ )
36
70
    {
72
    {
39
71
        lookup_candidate_t token = g_array_index(m_array, lookup_candidate_t, i);
73
        lookup_candidate_t * candidate = NULL;
40
72
        char* word = NULL;
74
	pinyin_get_candidate(m_instance, i, &candidate);
41
75
42
76
        const char* word = NULL;
43
77
	pinyin_get_candidate_string(m_instance, candidate, &word);
44
78
45
73
        // Translate the token to utf-8 phrase.
79
        // Translate the token to utf-8 phrase.
46
74
        pinyin_translate_token(m_instance, token.m_token, &word);
47
75
        if (word) {
80
        if (word) {
48
76
            candidates.append(QString(word));
81
            candidates.append(QString(word));
49
77
        }
82
        }
50
78
        g_free(word);
51
79
    }
83
    }
52
80
84
53
81
    QString unicode(sentence);
85
    QString unicode(sentence);
54
@@ -91,7 +95,10 @@
55
91
void PinyinAdapter::wordCandidateSelected(const QString& word)
95
void PinyinAdapter::wordCandidateSelected(const QString& word)
56
92
{
96
{
57
93
    Q_UNUSED(word)
97
    Q_UNUSED(word)
59
94
    pinyin_choose_candidate(m_instance, 0, &g_array_index(m_array, lookup_candidate_t, 1));
98
60
99
    lookup_candidate_t * candidate = NULL;
61
100
    pinyin_get_candidate(m_instance, 1, &candidate);
62
101
    pinyin_choose_candidate(m_instance, 0, candidate);
63
95
}
102
}
64
96
103
65
97
void PinyinAdapter::reset()
104
void PinyinAdapter::reset()
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2013-11-04	Approve on 2013-11-18
Günter Schwann (community)		2013-11-04	Approve on 2013-11-11
Review via email: mp+193859@code.launchpad.net
1	=== modified file 'debian/control'
2	--- debian/control 2013-11-07 16:07:36 +0000
3	+++ debian/control 2013-11-12 23:09:13 +0000
4	@@ -10,7 +10,7 @@
5	10	libglib2.0-dev,	10	libglib2.0-dev,
6	11	libgsettings-qt-dev,	11	libgsettings-qt-dev,
7	12	libhunspell-dev,	12	libhunspell-dev,
9	13	libpinyin2-dev,	13	libpinyin4-dev,
10	14	libplatform-api1-dev,	14	libplatform-api1-dev,
11	15	libpresage-dev,	15	libpresage-dev,
12	16	libxml2-utils,	16	libxml2-utils,
13	17		17
14	=== modified file 'src/lib/logic/pinyinadapter.cpp'
15	--- src/lib/logic/pinyinadapter.cpp 2013-08-19 20:44:22 +0000
16	+++ src/lib/logic/pinyinadapter.cpp 2013-11-12 23:09:13 +0000
17	@@ -57,8 +57,8 @@
18	57	std::cout << std::endl;	57	std::cout << std::endl;
19	58	#endif	58	#endif
20	59		59
23	60	m_array = g_array_new(FALSE, FALSE, sizeof(lookup_candidate_t));	60
24	61	pinyin_get_candidates(m_instance, 0, m_array);	61	pinyin_guess_candidates(m_instance, 0);
25	62		62
26	63	pinyin_guess_sentence(m_instance);	63	pinyin_guess_sentence(m_instance);
27	64		64
28	@@ -66,16 +66,20 @@
29	66	pinyin_get_sentence(m_instance, &sentence);	66	pinyin_get_sentence(m_instance, &sentence);
30	67		67
31	68	candidates.clear();	68	candidates.clear();
33	69	for (unsigned int i = 0 ; i < m_array->len; i ++ )	69	guint len = 0;
34			70	pinyin_get_n_candidate(m_instance, &len);
35			71	for (unsigned int i = 0 ; i < len; i ++ )
36	70	{	72	{
39	71	lookup_candidate_t token = g_array_index(m_array, lookup_candidate_t, i);	73	lookup_candidate_t * candidate = NULL;
40	72	char* word = NULL;	74	pinyin_get_candidate(m_instance, i, &candidate);
41			75
42			76	const char* word = NULL;
43			77	pinyin_get_candidate_string(m_instance, candidate, &word);
44			78
45	73	// Translate the token to utf-8 phrase.	79	// Translate the token to utf-8 phrase.
46	74	pinyin_translate_token(m_instance, token.m_token, &word);
47	75	if (word) {	80	if (word) {
48	76	candidates.append(QString(word));	81	candidates.append(QString(word));
49	77	}	82	}
50	78	g_free(word);
51	79	}	83	}
52	80		84
53	81	QString unicode(sentence);	85	QString unicode(sentence);
54	@@ -91,7 +95,10 @@
55	91	void PinyinAdapter::wordCandidateSelected(const QString& word)	95	void PinyinAdapter::wordCandidateSelected(const QString& word)
56	92	{	96	{
57	93	Q_UNUSED(word)	97	Q_UNUSED(word)
59	94	pinyin_choose_candidate(m_instance, 0, &g_array_index(m_array, lookup_candidate_t, 1));	98
60			99	lookup_candidate_t * candidate = NULL;
61			100	pinyin_get_candidate(m_instance, 1, &candidate);
62			101	pinyin_choose_candidate(m_instance, 0, candidate);
63	95	}	102	}
64	96		103
65	97	void PinyinAdapter::reset()	104	void PinyinAdapter::reset()