* src/encoding.C (latexChar,read):

[lyx.git] / src / support / unicode.h

diff --git a/src/support/unicode.h b/src/support/unicode.h
index e04f3b6ebb29e1b6af947945f6578f442bccd18f..5137e8e663c01df4e9c9bacb51afa6b72a18fff7 100644 (file)
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -56,10 +56,6 @@ private:
        boost::scoped_ptr<Private> pimpl_;
 };
 
-/// This is implemented in lyx_main.C for the LyX program 
-/// and in client.C for the LyX client program.
-extern IconvProcessor & utf8ToUcs4();
-
 // A single codepoint conversion for utf8_to_ucs4 does not make
 // sense, so that function is left out.
 
@@ -67,24 +63,13 @@ std::vector<lyx::char_type> utf8_to_ucs4(std::vector<char> const & utf8str);
 
 std::vector<lyx::char_type> utf8_to_ucs4(char const * utf8str, size_t ls);
 
-// ucs2_to_ucs4
-
-lyx::char_type ucs2_to_ucs4(unsigned short c);
-
-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
+// utf16_to_ucs4
 
-unsigned short ucs4_to_ucs2(lyx::char_type c);
+std::vector<char_type> utf16_to_ucs4(unsigned short const * s, size_t ls);
 
-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
 
@@ -105,7 +90,6 @@ std::vector<char>
 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