X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FISpell.cpp;h=bd772685c7b9fc8dbc70ae94099d41e93eab70d4;hb=ea6aed5b8bf38366aaa1eb15ce1b9f13de76987f;hp=daeaabab469e3d3b2e1c21d2396aa7202a89a711;hpb=1aafa6ff77b792e4ddc3454d9604bf9c15588731;p=lyx.git diff --git a/src/ISpell.cpp b/src/ISpell.cpp index daeaabab46..bd772685c7 100644 --- a/src/ISpell.cpp +++ b/src/ISpell.cpp @@ -36,25 +36,15 @@ using boost::shared_ptr; -#ifndef CXX_GLOBAL_CSTD -using std::strcpy; -using std::strlen; -using std::strpbrk; -#endif - -using std::endl; -using std::max; -using std::string; - +using namespace std; +using namespace lyx::support; namespace lyx { -using support::bformat; - namespace { -class LaunchIspell : public support::ForkedProcess { - typedef support::ForkedProcess ForkedProcess; +class LaunchIspell : public ForkedProcess +{ public: /// LaunchIspell(BufferParams const & p, string const & l, @@ -194,7 +184,7 @@ int LaunchIspell::generateChild() string const to_iconv_encoding(docstring const & s, string const & encoding) { if (lyxrc.isp_use_input_encoding) { - std::vector const encoded = + vector const encoded = ucs4_to_eightbit(s.data(), s.length(), encoding); return string(encoded.begin(), encoded.end()); } @@ -206,7 +196,7 @@ string const to_iconv_encoding(docstring const & s, string const & encoding) docstring const from_iconv_encoding(string const & s, string const & encoding) { if (lyxrc.isp_use_input_encoding) { - std::vector const ucs4 = + vector const ucs4 = eightbit_to_ucs4(s.data(), s.length(), encoding); return docstring(ucs4.begin(), ucs4.end()); }