From: Peng Wu Date: Thu, 1 Jul 2010 03:55:52 +0000 (+0800) Subject: fixes compile errors. X-Git-Tag: 1.3.10~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=008393c40013869af5a8d8c4de618e232ee42dc4;p=platform%2Fupstream%2Fibus-libpinyin.git fixes compile errors. --- diff --git a/src/DynamicSpecialPhrase.cc b/src/DynamicSpecialPhrase.cc index 896b9fc..2541e4e 100644 --- a/src/DynamicSpecialPhrase.cc +++ b/src/DynamicSpecialPhrase.cc @@ -194,7 +194,7 @@ static unit_t units[] ={ {"", 0, true}, }; -inline const std::string +const std::string DynamicSpecialPhrase::simplest_cn_number(gint64 num) { std::string result = ""; @@ -257,13 +257,13 @@ translate_to_longform(gint64 num, const char * number[10]) return result; } -inline const std::string +const std::string DynamicSpecialPhrase::simplified_number(gint64 num) { return translate_to_longform(num, numbers[1]); } -inline const std::string +const std::string DynamicSpecialPhrase::traditional_number(gint64 num) { if ( 0 == num ) diff --git a/src/ExtEditor.cc b/src/ExtEditor.cc index 3567772..826fdf7 100644 --- a/src/ExtEditor.cc +++ b/src/ExtEditor.cc @@ -29,6 +29,8 @@ extern "C" { #include "Pointer.h" #include "LookupTable.h" +#include "DynamicSpecialPhrase.h" + #include "Editor.h" #include "ExtEditor.h" @@ -708,24 +710,26 @@ ExtEditor::fillChineseNumber(gint64 num) { clearLookupTable(); + DynamicSpecialPhrase phrase ("", 0); + if ( LABEL_LIST_NUMBERS == m_mode) { for ( int i = 1; i <= 10; ++i ) m_lookup_table.setLabel ( i - 1, Text (i - 1 + 'a') ); } - std::string result = translate_to_simplified(num); + std::string result = phrase.simplified_number(num); if ( !result.empty() ){ Text text(result); m_lookup_table.appendCandidate(text); } - result = translate_to_traditional(num); + result = phrase.traditional_number(num); if ( !result.empty() ){ Text text(result); m_lookup_table.appendCandidate(text); } - result = translate_to_simplest(num); + result = phrase.simplest_cn_number(num); if ( !result.empty() ){ Text text(result); m_lookup_table.appendCandidate(text);