std::vector<lyx::char_type> utf8_to_ucs4(char const * utf8str, size_t ls);
-// ucs2_to_ucs4
+// utf16_to_ucs4
-lyx::char_type ucs2_to_ucs4(unsigned short c);
+std::vector<char_type> utf16_to_ucs4(unsigned short const * s, size_t ls);
-std::vector<lyx::char_type>
-ucs2_to_ucs4(std::vector<unsigned short> const & ucs2str);
-
-std::vector<lyx::char_type>
-ucs2_to_ucs4(unsigned short const * ucs2str, size_t ls);
-
-// ucs4_to_ucs2
-
-unsigned short ucs4_to_ucs2(lyx::char_type c);
-
-std::vector<unsigned short>
-ucs4_to_ucs2(std::vector<lyx::char_type> const & ucs4str);
+// ucs4_to_utf16
-std::vector<unsigned short> ucs4_to_ucs2(lyx::char_type const * s, size_t ls);
+std::vector<unsigned short> ucs4_to_utf16(char_type const * s, size_t ls);
// ucs4_to_utf8
ucs4_to_eightbit(lyx::char_type const * ucs4str, size_t ls, std::string const & encoding);
extern char const * ucs4_codeset;
-extern char const * ucs2_codeset;
} // namespace lyx