diff --git a/scim-wnn/src/convertor.cpp b/scim-wnn/src/convertor.cpp index 5f87b32..b675f0b 100644 --- a/scim-wnn/src/convertor.cpp +++ b/scim-wnn/src/convertor.cpp @@ -59,7 +59,7 @@ return(0); } -ResultList Convertor::getConversionList(int p,int kt){ +ResultList Convertor::getResultList(int p,int kt){ return(ResultList()); } diff --git a/scim-wnn/src/convertor.h b/scim-wnn/src/convertor.h index 4a44fa9..dd64222 100644 --- a/scim-wnn/src/convertor.h +++ b/scim-wnn/src/convertor.h @@ -56,7 +56,7 @@ virtual WideString getText(); virtual int setPos(int p); virtual int getPos(); - virtual ResultList getConversionList(int p = -1 ,int kt = 0); + virtual ResultList getResultList(int p = -1 ,int kt = 0); virtual ResultList getYosokuList(const WideString &str); virtual bool select(int p); virtual AttributeList getAttributeList(); diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp index c943833..f2aa179 100644 --- a/scim-wnn/src/scim_wnn_imengine.cpp +++ b/scim-wnn/src/scim_wnn_imengine.cpp @@ -611,7 +611,7 @@ bool r; k_conversion_shrink.comp(key) ? r = wnn->resizeRegion(-1) : r = wnn->resizeRegion(1); if (!r) return(true); - m_convList = wnn->getConversionList(); + m_convList = wnn->getResultList(); if (alp == -1) { startLookup(); } else m_lookup = false; @@ -620,7 +620,7 @@ return(true); } else if (k_conversion_rensou.comp(key) && ((sType == "Wnn7") || (sType == "Wnn8")) ) { - m_convList = wnn->getConversionList(wnn->getPos(),RENSOU); + m_convList = wnn->getResultList(wnn->getPos(),RENSOU); if (m_convList.count == 0) return(true); startLookup(); updateConversion(); @@ -628,7 +628,7 @@ return(true); } else if (k_conversion_ikeiji.comp(key) && ((sType == "Wnn7") || (sType == "Wnn8")) ) { - m_convList = wnn->getConversionList(wnn->getPos(),IKEIJI); + m_convList = wnn->getResultList(wnn->getPos(),IKEIJI); if (m_convList.count == 0) return(true); startLookup(); updateConversion(); @@ -637,7 +637,7 @@ } else if (k_conversion_forward.comp(key) || k_conversion_backward.comp(key)) { k_conversion_backward.comp(key) ? wnn->setPos(wnn->getPos() - 1) : wnn->setPos(wnn->getPos() + 1); - m_convList = wnn->getConversionList(); + m_convList = wnn->getResultList(); if (alp == -1) { startLookup(); } else m_lookup = false; @@ -675,7 +675,7 @@ m_convList.pos = numc + m_lookup_table.get_current_page_start(); wnn->select(m_convList.pos); wnn->setPos(wnn->getPos() + 1); - m_convList = wnn->getConversionList(); + m_convList = wnn->getResultList(); updateConversion(); startLookup(); return(true); @@ -912,7 +912,7 @@ return; } m_convList.kouho.clear(); - m_convList = wnn->getConversionList(); + m_convList = wnn->getResultList(); m_conversion = true; alp_count = 1; diff --git a/scim-wnn/src/wnnconversion.cpp b/scim-wnn/src/wnnconversion.cpp index c00bf39..6956e79 100644 --- a/scim-wnn/src/wnnconversion.cpp +++ b/scim-wnn/src/wnnconversion.cpp @@ -364,9 +364,9 @@ /*! - \fn WnnConversion::getConversionList(int p,int kt) + \fn WnnConversion::getResultList(int p,int kt) */ -ResultList WnnConversion::getConversionList(int p,int kt) +ResultList WnnConversion::getResultList(int p,int kt) { w_char k[1024]; char buf[2048]; diff --git a/scim-wnn/src/wnnconversion.h b/scim-wnn/src/wnnconversion.h index 734aa67..566efac 100644 --- a/scim-wnn/src/wnnconversion.h +++ b/scim-wnn/src/wnnconversion.h @@ -64,7 +64,7 @@ virtual WideString getText(); virtual int setPos(int p); virtual int getPos(); - virtual ResultList getConversionList(int p = -1 ,int kt = DEFAULT); + virtual ResultList getResultList(int p = -1 ,int kt = DEFAULT); virtual ResultList getYosokuList(const WideString &str); virtual bool select(int p); virtual AttributeList getAttributeList();