diff --git a/scim-wnn/src/romkan.cpp b/scim-wnn/src/romkan.cpp index 937e3f2..b280040 100644 --- a/scim-wnn/src/romkan.cpp +++ b/scim-wnn/src/romkan.cpp @@ -82,14 +82,14 @@ s = k; if (k == 0) return(text); switch(mode) { - case LATIN: { + case ASCII: { buf.clear(); text = text.substr(0,pos) + utf8_mbstowcs(s) + text.substr(pos); pos ++; return(text); break; } - case WLATIN: { + case WASCII: { buf.clear(); WideString w = utf8_mbstowcs(s); convHanZen(w); @@ -100,11 +100,11 @@ } case ROMA: { if (k == 'q') { - mode = LATIN; + mode = ASCII; buf.clear(); return(text); } else if (k == 'Q') { - mode = WLATIN; + mode = WASCII; buf.clear(); return(text); } @@ -255,7 +255,7 @@ */ bool Romkan::keyEventHook(const KeyEvent &key) { - if ((isprint(key.code)) && ((mode == LATIN) || (mode == WLATIN))) { + if ((isprint(key.code)) && ((mode == ASCII) || (mode == WASCII))) { if ((!key.is_alt_down()) && (!key.is_control_down())) { insert(key.get_ascii_code()); return(true); @@ -283,12 +283,12 @@ return(String(_("Roma-Kana"))); break; } - case LATIN: { - return(String(_("Latin"))); + case ASCII: { + return(String(_("Ascii"))); break; } - case WLATIN: { - return(String(_("Wide Latin"))); + case WASCII: { + return(String(_("Wide Ascii"))); break; } } @@ -300,7 +300,7 @@ */ bool Romkan::cancelEvent() { - if ((mode == LATIN) || (mode == WLATIN)) { + if ((mode == ASCII) || (mode == WASCII)) { mode = ROMA; return(true); } diff --git a/scim-wnn/src/romkan.h b/scim-wnn/src/romkan.h index bd59f9e..1c8cc88 100644 --- a/scim-wnn/src/romkan.h +++ b/scim-wnn/src/romkan.h @@ -61,7 +61,7 @@ protected: String buf; String modeName; - enum inputMode {ROMA,LATIN,WLATIN}; + enum inputMode {ROMA,ASCII,WASCII}; inputMode mode; };