diff options
| author | Peng Wu <alexepico@gmail.com> | 2018-06-22 13:28:18 +0800 |
|---|---|---|
| committer | Peng Wu <alexepico@gmail.com> | 2018-06-22 13:37:57 +0800 |
| commit | 7128295dfc35233b52f511f00ab6920e8905ec76 (patch) | |
| tree | 42a1e70df7a898aae2da075603d7427ccd842f9f | |
| parent | f17ae41890b16121f9498c5bb2336137feab781d (diff) | |
| download | ibus-libpinyin-7128295dfc35233b52f511f00ab6920e8905ec76.tar.gz ibus-libpinyin-7128295dfc35233b52f511f00ab6920e8905ec76.tar.xz ibus-libpinyin-7128295dfc35233b52f511f00ab6920e8905ec76.zip | |
drop SELECT_CANDIDATE_MODIFY_IN_PLACE_AND_COMMIT
| -rw-r--r-- | src/PYPEnhancedCandidates.h | 5 | ||||
| -rw-r--r-- | src/PYPLibPinyinCandidates.cc | 2 | ||||
| -rw-r--r-- | src/PYPLuaConverterCandidates.cc | 2 | ||||
| -rw-r--r-- | src/PYPTradCandidates.cc | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/src/PYPEnhancedCandidates.h b/src/PYPEnhancedCandidates.h index 02090cf..2d154fd 100644 --- a/src/PYPEnhancedCandidates.h +++ b/src/PYPEnhancedCandidates.h @@ -52,11 +52,6 @@ enum SelectCandidateAction { SELECT_CANDIDATE_UPDATE = 0x4 }; -/* modify the candidate recursively for candidates process chain, - then commit the changed text. */ -#define SELECT_CANDIDATE_MODIFY_IN_PLACE_AND_COMMIT \ - (SELECT_CANDIDATE_MODIFY_IN_PLACE|SELECT_CANDIDATE_COMMIT) - struct EnhancedCandidate { CandidateType m_candidate_type; guint m_candidate_id; diff --git a/src/PYPLibPinyinCandidates.cc b/src/PYPLibPinyinCandidates.cc index 39bd9ad..17a6da9 100644 --- a/src/PYPLibPinyinCandidates.cc +++ b/src/PYPLibPinyinCandidates.cc @@ -116,7 +116,7 @@ LibPinyinCandidates::selectCandidate (EnhancedCandidate & enhanced) pinyin_get_sentence (instance, 0, &tmp); enhanced.m_display_string = tmp; pinyin_train (instance, 0); - return SELECT_CANDIDATE_MODIFY_IN_PLACE_AND_COMMIT; + return SELECT_CANDIDATE_MODIFY_IN_PLACE|SELECT_CANDIDATE_COMMIT; } PinyinKeyPos *pos = NULL; diff --git a/src/PYPLuaConverterCandidates.cc b/src/PYPLuaConverterCandidates.cc index e47ee71..472fc90 100644 --- a/src/PYPLuaConverterCandidates.cc +++ b/src/PYPLuaConverterCandidates.cc @@ -90,7 +90,7 @@ LuaConverterCandidates::selectCandidate (EnhancedCandidate & enhanced) int action = m_editor->selectCandidateInternal (m_candidates[id]); - if (SELECT_CANDIDATE_MODIFY_IN_PLACE_AND_COMMIT == action) { + if (action & SELECT_CANDIDATE_MODIFY_IN_PLACE) { ibus_engine_plugin_call (m_lua_plugin, converter, enhanced.m_display_string.c_str ()); gchar * string = ibus_engine_plugin_get_first_result (m_lua_plugin); diff --git a/src/PYPTradCandidates.cc b/src/PYPTradCandidates.cc index acfc271..d625164 100644 --- a/src/PYPTradCandidates.cc +++ b/src/PYPTradCandidates.cc @@ -60,7 +60,7 @@ TraditionalCandidates::selectCandidate (EnhancedCandidate & enhanced) int action = m_editor->selectCandidateInternal (m_candidates[id]); - if (SELECT_CANDIDATE_MODIFY_IN_PLACE_AND_COMMIT == action) { + if (action & SELECT_CANDIDATE_MODIFY_IN_PLACE) { String trad; SimpTradConverter::simpToTrad (m_candidates[id].m_display_string.c_str (), trad); |