fixes compile

diff --git a/src/PYLibPinyin.cc b/src/PYLibPinyin.cc
index 12ed8bc..eb88e16 100644 (file)
--- a/src/PYLibPinyin.cc
+++ b/src/PYLibPinyin.cc
@@ -27,7 +27,6 @@
 
 #define LIBPINYIN_SAVE_TIMEOUT   (5 * 60)
 
-using namespace pinyin;
 using namespace PY;
 
 std::unique_ptr<LibPinyinBackEnd> LibPinyinBackEnd::m_instance;

diff --git a/src/PYPBopomofoEditor.cc b/src/PYPBopomofoEditor.cc
index 3c0b9bc..5c901c2 100644 (file)
--- a/src/PYPBopomofoEditor.cc
+++ b/src/PYPBopomofoEditor.cc
@@ -358,7 +358,7 @@ LibPinyinBopomofoEditor::updateAuxiliaryText (void)
                              m_cursor < end)) { /* in word */
             /* raw text */
             guint16 length = 0;
-            pinyin_get_key_rest_length (m_instance, pos, &length);
+            pinyin_get_pinyin_key_rest_length (m_instance, pos, &length);
 
             String raw = m_text.substr (cursor, length);
             guint offset = m_cursor - cursor;

diff --git a/src/PYPConfig.cc b/src/PYPConfig.cc
index 4925a48..0632ea8 100644 (file)
--- a/src/PYPConfig.cc
+++ b/src/PYPConfig.cc
@@ -25,7 +25,6 @@
 #include "PYBus.h"
 #include "PYLibPinyin.h"
 
-using namespace pinyin;
 
 namespace PY {
 

diff --git a/src/PYPFullPinyinEditor.cc b/src/PYPFullPinyinEditor.cc
index 816fea9..a11b862 100644 (file)
--- a/src/PYPFullPinyinEditor.cc
+++ b/src/PYPFullPinyinEditor.cc
@@ -143,7 +143,7 @@ void
 LibPinyinFullPinyinEditor::update (void)
 {
     guint lookup_cursor = getLookupCursor ();
-    pinyin_guess_full_pinyin_candidates (m_instance, lookup_cursor, m_candidates);
+    pinyin_guess_full_pinyin_candidates (m_instance, lookup_cursor);
 
     updateLookupTable ();
     updatePreeditText ();

diff --git a/src/PYPPhoneticEditor.cc b/src/PYPPhoneticEditor.cc
index b12b21d..c7d794a 100644 (file)
--- a/src/PYPPhoneticEditor.cc
+++ b/src/PYPPhoneticEditor.cc
@@ -322,7 +322,7 @@ LibPinyinPhoneticEditor::getPinyinCursor ()
     for (size_t i = 0; i < len; ++i) {
         PinyinKeyPos *pos = NULL;
         pinyin_get_pinyin_key_rest (m_instance, i, &pos);
-        pinyin_get_key_rest_positions (m_instance, pos, NULL, &cur_end);
+        pinyin_get_pinyin_key_rest_positions (m_instance, pos, NULL, &cur_end);
 
         if (prev_end <= m_cursor && m_cursor < cur_end)
             pinyin_cursor = i;