diff --git a/honoka/libhonoka/convertor.cpp b/honoka/libhonoka/convertor.cpp index b9c1b4b..8f4e77f 100644 --- a/honoka/libhonoka/convertor.cpp +++ b/honoka/libhonoka/convertor.cpp @@ -72,12 +72,6 @@ return 0; } -WideString Convertor::getText() { - // �Ѵ���Υƥ����Ȥ򥲥åȤ��ޤ��� - // �������������ä����Ϥ��θ�Υƥ����Ȥ��֤��褦�ˤ��ޤ��� - return WideString(); -} - int Convertor::setPos(int p){ // ���ܤ���ʸ����֤򥻥åȤ��ޤ���0���鳫�Ϥ��ޤ��� return 0; @@ -100,11 +94,6 @@ return false; } -AttributeList Convertor::getAttributeList() { - // getText���Ф���Attribute���֤��ޤ��� - return AttributeList(); -} - bool Convertor::resizeRegion(int w) { // ����ʸ��������ϰϤ���ꤷ�ޤ���w�������ͤ���ꤷ�ޤ��� return false; @@ -126,13 +115,6 @@ return; } -int Convertor::getCaretPos() { - // �Ѵ����Υ����åȤΰ��֤���ꤷ�ޤ��� - // SCIM�ξ��lookupTable�ϥ����åȤΰ��֤�ɽ�������褦�ʤΤ� - // ���δؿ��Ǥ��ΰ��֤򤭤�ޤ��� - return 0; -} - String Convertor::getName() { diff --git a/honoka/libhonoka/convertor.h b/honoka/libhonoka/convertor.h index cd68d62..97d58c7 100644 --- a/honoka/libhonoka/convertor.h +++ b/honoka/libhonoka/convertor.h @@ -60,17 +60,14 @@ virtual void reset(); virtual void setYomiText(WideString yomi); virtual int ren_conversion(); - virtual WideString getText(); virtual int setPos(int p); virtual int getPos(); virtual ResultList getResultList(int p = -1 ,ResultType kt = DEFAULT); virtual bool select(int p); - virtual AttributeList getAttributeList(); virtual bool resizeRegion(int w); virtual void updateFrequency(); virtual bool connect(); virtual void disconnect(); - virtual int getCaretPos(); virtual String getName(); virtual String getPropertyName(); virtual const vector getSegmentList(); diff --git a/honoka/libhonoka/honokapluginbase.h b/honoka/libhonoka/honokapluginbase.h index 509a61a..29b9771 100644 --- a/honoka/libhonoka/honokapluginbase.h +++ b/honoka/libhonoka/honokapluginbase.h @@ -27,7 +27,7 @@ #include #define Uses_SCIM_CONFIG_BASE -#define HONOKA_PLUGIN_VERSION 1 +#define HONOKA_PLUGIN_VERSION 2 using namespace std; using namespace scim; diff --git a/honoka/plugins/anthyconversion.cpp b/honoka/plugins/anthyconversion.cpp index 2a3d155..1426afb 100644 --- a/honoka/plugins/anthyconversion.cpp +++ b/honoka/plugins/anthyconversion.cpp @@ -80,14 +80,6 @@ return stat.nr_segment; } -WideString AnthyConversion::getText() { - WideString text; - for(unsigned int i = 0;i < convResult.size();i ++) { - text += convResult[i].kouho[convResult[i].pos].kanji; - } - return text; -} - const vector AnthyConversion::getSegmentList() { vector result; for(unsigned int i = 0;i < convResult.size();i ++) result.push_back(Segment(convResult[i].kouho[convResult[i].pos].kanji,convResult[i].Yomi)); @@ -120,19 +112,6 @@ return false; } -AttributeList AnthyConversion::getAttributeList() { - AttributeList attr; - int l = 0; - for(unsigned int i = 0;i < convResult.size();i ++) { - if (pos == i) { - Attribute a(l,convResult[i].kouho[convResult[i].pos].kanji.length(),SCIM_ATTR_DECORATE,SCIM_ATTR_DECORATE_REVERSE); - attr.push_back(a); - } - l += convResult[i].kouho[convResult[i].pos].kanji.length(); - } - return attr; -} - bool AnthyConversion::resizeRegion(int w) { //if ((convResult[pos].kouho[convResult[pos].pos].length() + w) < 1) return false; if ((convResult[pos].Yomi.length() + w) < 1) return false; @@ -156,14 +135,6 @@ return; } -int AnthyConversion::getCaretPos() { - int l = 0; - for(unsigned int i = 0;i < convResult.size();i ++) { - if (pos == i) return l; - l += convResult[i].kouho[convResult[i].pos].kanji.length(); - } - return 0; -} void AnthyConversion::buildResult() { struct anthy_conv_stat stat; diff --git a/honoka/plugins/anthyconversion.h b/honoka/plugins/anthyconversion.h index fe80a2f..f170a28 100644 --- a/honoka/plugins/anthyconversion.h +++ b/honoka/plugins/anthyconversion.h @@ -46,17 +46,14 @@ virtual void reset(); virtual void setYomiText(WideString yomi); virtual int ren_conversion(); - virtual WideString getText(); virtual int setPos(int p); virtual int getPos(); virtual ResultList getResultList(int p = -1 ,ResultType kt = DEFAULT); virtual bool select(int p); - virtual AttributeList getAttributeList(); virtual bool resizeRegion(int w); virtual void updateFrequency(); virtual bool connect(); virtual void disconnect(); - virtual int getCaretPos(); virtual String getName(); virtual String getPropertyName(); virtual const vector getSegmentList(); diff --git a/honoka/plugins/cannaconversion.cpp b/honoka/plugins/cannaconversion.cpp index 71028e5..bb71fac 100644 --- a/honoka/plugins/cannaconversion.cpp +++ b/honoka/plugins/cannaconversion.cpp @@ -84,14 +84,6 @@ return bun; } -WideString CannaConversion::getText() { - WideString text; - for(unsigned int i = 0;i < convResult.size();i ++) { - text += convResult[i].kouho[convResult[i].pos].kanji; - } - return text; -} - const vector CannaConversion::getSegmentList() { vector result; for(unsigned int i = 0;i < convResult.size();i ++) result.push_back(Segment(convResult[i].kouho[convResult[i].pos].kanji,convResult[i].Yomi)); @@ -125,18 +117,6 @@ return false; } -AttributeList CannaConversion::getAttributeList() { - AttributeList attr; - int l = 0; - for(unsigned int i = 0;i < convResult.size();i ++) { - if (pos == i) { - Attribute a(l,convResult[i].kouho[convResult[i].pos].kanji.length(),SCIM_ATTR_DECORATE,SCIM_ATTR_DECORATE_REVERSE); - attr.push_back(a); - } - l += convResult[i].kouho[convResult[i].pos].kanji.length(); - } - return attr; -} bool CannaConversion::resizeRegion(int w) { if ((convResult[pos].Yomi.length() + w) < 1) return false; @@ -183,15 +163,6 @@ return; } -int CannaConversion::getCaretPos() { - int l = 0; - for(unsigned int i = 0;i < convResult.size();i ++) { - if (pos == i) return l; - l += convResult[i].kouho[convResult[i].pos].kanji.length(); - } - return 0; -} - void CannaConversion::buildResult() { convResult.clear(); for(unsigned int i = 0;i < bun;i ++) { diff --git a/honoka/plugins/cannaconversion.h b/honoka/plugins/cannaconversion.h index 650102c..6982e98 100644 --- a/honoka/plugins/cannaconversion.h +++ b/honoka/plugins/cannaconversion.h @@ -47,17 +47,14 @@ virtual void reset(); virtual void setYomiText(WideString yomi); virtual int ren_conversion(); - virtual WideString getText(); virtual int setPos(int p); virtual int getPos(); virtual ResultList getResultList(int p = -1 ,ResultType kt = DEFAULT); virtual bool select(int p); - virtual AttributeList getAttributeList(); virtual bool resizeRegion(int w); virtual void updateFrequency(); virtual bool connect(); virtual void disconnect(); - virtual int getCaretPos(); virtual String getName(); virtual String getPropertyName(); virtual const vector getSegmentList(); diff --git a/honoka/plugins/skkdicconversion.cpp b/honoka/plugins/skkdicconversion.cpp index 9cf5231..2c85bc5 100644 --- a/honoka/plugins/skkdicconversion.cpp +++ b/honoka/plugins/skkdicconversion.cpp @@ -80,14 +80,6 @@ return 1; } -WideString SKKDicConversion::getText() { - WideString t; - for(unsigned int i = 0;i < texts.size();i ++) { - t = t + texts[i]; - } - return t; -} - const vector SKKDicConversion::getSegmentList() { vector result; for(unsigned int i = 0;i < texts.size();i ++) result.push_back(Segment(texts[i],buns[i])); @@ -137,19 +129,6 @@ return false; } -AttributeList SKKDicConversion::getAttributeList() { - AttributeList attr; - int l = 0; - for(unsigned int i = 0;i < texts.size();i ++) { - if (pos == i) { - Attribute a(l,texts[i].length(),SCIM_ATTR_DECORATE,SCIM_ATTR_DECORATE_REVERSE); - attr.push_back(a); - } - l += texts[i].length(); - } - return attr; -} - bool SKKDicConversion::resizeRegion(int w) { if ((buns[pos].length() + w) < 1) return false; if ((pos >= (buns.size() - 1)) && (w > 0)) return false; @@ -181,15 +160,6 @@ return; } -int SKKDicConversion::getCaretPos() { - int l = 0; - for(unsigned int i = 0;i < texts.size();i ++) { - if (pos == i) return l; - l += texts[i].length(); - } - return 0; -} - String SKKDicConversion::getName() { diff --git a/honoka/plugins/skkdicconversion.h b/honoka/plugins/skkdicconversion.h index 8f39ff2..903aebb 100644 --- a/honoka/plugins/skkdicconversion.h +++ b/honoka/plugins/skkdicconversion.h @@ -47,17 +47,14 @@ virtual void reset(); virtual void setYomiText(WideString yomi); virtual int ren_conversion(); - virtual WideString getText(); virtual int setPos(int p); virtual int getPos(); virtual ResultList getResultList(int p = -1 ,ResultType kt = DEFAULT); virtual bool select(int p); - virtual AttributeList getAttributeList(); virtual bool resizeRegion(int w); virtual void updateFrequency(); virtual bool connect(); virtual void disconnect(); - virtual int getCaretPos(); virtual String getName(); virtual String getPropertyName(); virtual const vector getSegmentList(); diff --git a/honoka/plugins/wnnconversion.cpp b/honoka/plugins/wnnconversion.cpp index 0848ca8..048a4e7 100644 --- a/honoka/plugins/wnnconversion.cpp +++ b/honoka/plugins/wnnconversion.cpp @@ -299,13 +299,6 @@ text = w; } -/*! - \fn WnnConversion::getText() - */ -WideString WnnConversion::getText() -{ - return text; -} /*! \fn WnnConversion::getSegmentList() @@ -320,15 +313,6 @@ /*! - \fn WnnConversion::getAttributeList() - */ -AttributeList WnnConversion::getAttributeList() -{ - return attr; -} - - -/*! \fn WnnConversion::setPos(int p) */ int WnnConversion::setPos(int p) @@ -501,20 +485,12 @@ jl_yosoku_toroku(wnn,ws,c); #endif jl_optimize_fi(wnn,0,-1); - pretext = getText(); + pretext = text; } } -/*! - \fn WnnConversion::getCaretPos() - */ -int WnnConversion::getCaretPos() -{ - return caretPos; -} - String WnnConversion::getName() { diff --git a/honoka/plugins/wnnconversion.h b/honoka/plugins/wnnconversion.h index fcb8e40..270a3df 100644 --- a/honoka/plugins/wnnconversion.h +++ b/honoka/plugins/wnnconversion.h @@ -57,18 +57,15 @@ virtual void reset(); virtual void setYomiText(WideString yomi); virtual int ren_conversion(); - virtual WideString getText(); virtual int setPos(int p); virtual int getPos(); virtual ResultList getResultList(int p = -1 ,ResultType kt = DEFAULT); ResultList getYosokuList(const WideString &str); virtual bool select(int p); - virtual AttributeList getAttributeList(); virtual bool resizeRegion(int w); virtual void updateFrequency(); virtual bool connect(); virtual void disconnect(); - virtual int getCaretPos(); virtual String getName(); virtual String getPropertyName(); virtual const vector getSegmentList(); diff --git a/honoka/src/multiconvertor.cpp b/honoka/src/multiconvertor.cpp index b3a5d3a..7a0d4d0 100644 --- a/honoka/src/multiconvertor.cpp +++ b/honoka/src/multiconvertor.cpp @@ -96,13 +96,6 @@ return b; } -WideString MultiConvertor::getText() { - WideString t; - for(unsigned int i = 0;i < texts.size();i ++) { - t = t + texts[i]; - } - return t; -} const vector MultiConvertor::getSegmentList() { vector result; @@ -205,19 +198,6 @@ return true; } -AttributeList MultiConvertor::getAttributeList() { - AttributeList attr; - int l = 0; - for(unsigned int i = 0;i < texts.size();i ++) { - if (getPos() == i) { - Attribute a(l,texts[i].length(),SCIM_ATTR_DECORATE,SCIM_ATTR_DECORATE_REVERSE); - attr.push_back(a); - } - l += texts[i].length(); - } - return attr; - -} bool MultiConvertor::resizeRegion(int w) { //return false; @@ -273,12 +253,6 @@ return; } -int MultiConvertor::getCaretPos() { - int p = 0; - for(unsigned int i = 0;i < getPos();i ++) p += texts[i].length(); - return p; -} - String MultiConvertor::getName() { diff --git a/honoka/src/multiconvertor.h b/honoka/src/multiconvertor.h index fa8a5f5..847b700 100644 --- a/honoka/src/multiconvertor.h +++ b/honoka/src/multiconvertor.h @@ -48,17 +48,14 @@ virtual void reset(); virtual void setYomiText(WideString yomi); virtual int ren_conversion(); - virtual WideString getText(); virtual int setPos(int p); virtual int getPos(); virtual ResultList getResultList(int p = -1 ,ResultType kt = DEFAULT); virtual bool select(int p); - virtual AttributeList getAttributeList(); virtual bool resizeRegion(int w); virtual void updateFrequency(); virtual bool connect(); virtual void disconnect(); - virtual int getCaretPos(); virtual String getName(); virtual String getPropertyName(); virtual const vector getSegmentList();