remove lyxrc dependence from support/*

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

diff --git a/src/support/unicode.h b/src/support/unicode.h
index 10b34ead701d5b49ed0a6715a151dfa80a959b39..12f112c44d60c97cf9a73e0a2411253e2d3206a3 100644 (file)
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -56,54 +56,48 @@ private:
        boost::scoped_ptr<Private> pimpl_;
 };
 
-extern IconvProcessor & utf8ToUcs4();
-
 // A single codepoint conversion for utf8_to_ucs4 does not make
 // sense, so that function is left out.
 
-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<char_type> utf8_to_ucs4(std::vector<char> const & utf8str);
 
-std::vector<lyx::char_type>
-ucs2_to_ucs4(std::vector<unsigned short> const & ucs2str);
+std::vector<char_type> utf8_to_ucs4(char const * utf8str, size_t ls);
 
-std::vector<lyx::char_type>
-ucs2_to_ucs4(unsigned short const * ucs2str, size_t ls);
+// utf16_to_ucs4
 
-// ucs4_to_ucs2
+std::vector<char_type> utf16_to_ucs4(unsigned short const * s, size_t ls);
 
-unsigned short ucs4_to_ucs2(lyx::char_type c);
+// ucs4_to_utf16
 
-std::vector<unsigned short>
-ucs4_to_ucs2(std::vector<lyx::char_type> const & ucs4str);
-
-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
 
-std::vector<char> ucs4_to_utf8(lyx::char_type c);
+std::vector<char> ucs4_to_utf8(char_type c);
 
-std::vector<char> ucs4_to_utf8(std::vector<lyx::char_type> const & ucs4str);
+std::vector<char> ucs4_to_utf8(std::vector<char_type> const & ucs4str);
 
-std::vector<char> ucs4_to_utf8(lyx::char_type const * ucs4str, size_t ls);
+std::vector<char> ucs4_to_utf8(char_type const * ucs4str, size_t ls);
 
 /// convert \p s from encoding \p encoding to ucs4.
 /// \p encoding must be a valid iconv 8bit encoding
-std::vector<lyx::char_type>
+std::vector<char_type>
 eightbit_to_ucs4(char const * s, size_t ls, std::string const & encoding);
 
 /// convert \p s from ucs4 to encoding \p encoding.
 /// \p encoding must be a valid iconv 8bit encoding
 std::vector<char>
-ucs4_to_eightbit(lyx::char_type const * ucs4str, size_t ls, std::string const & encoding);
+ucs4_to_eightbit(char_type const * ucs4str, size_t ls, std::string const & encoding);
+
+/// convert ucs4 character \p c to encoding \p encoding.
+/// \p encoding must be a valid iconv 8bit encoding
+char ucs4_to_eightbit(char_type c, std::string const & encoding);
+
+///
+void ucs4_to_multibytes(char_type ucs4, std::vector<char> & out,
+       std::string const & encoding);
 
 extern char const * ucs4_codeset;
-extern char const * ucs2_codeset;
 
 
 } // namespace lyx