Revert qprocess code. Revisions reverted: 22026, 22030, 22044, 22048,

[lyx.git] / src / support / docstream.cpp

diff --git a/src/support/docstream.cpp b/src/support/docstream.cpp
index 6c5dd8bed0d6bd3cbbba1e3fbd3d8f4cb9dd1b8f..3dad26c329ecc72ad03ce46c1b5660eedfd90064 100644 (file)
--- a/src/support/docstream.cpp
+++ b/src/support/docstream.cpp
@@ -10,20 +10,18 @@
 
 #include <config.h>
 
-#include "docstream.h"
-#include "unicode.h"
+#include "support/docstream.h"
+#include "support/unicode.h"
 
 #include <cerrno>
 #include <cstdio>
 #include <iconv.h>
 #include <locale>
 
+using namespace std;
 
 using lyx::ucs4_codeset;
 
-using std::string;
-
-
 namespace {
 
 // We use C IO throughout this file, because the facets might be used with
@@ -267,6 +265,15 @@ private:
 
 namespace lyx {
 
+template<class Ios>
+void setEncoding(Ios & ios, string const & encoding, std::ios_base::openmode mode)
+{
+       // We must imbue the stream before openening the file
+       std::locale global;
+       std::locale locale(global, new iconv_codecvt_facet(encoding, mode));
+       ios.imbue(locale);
+}
+
 
 const char * iconv_codecvt_facet_exception::what() const throw()
 {
@@ -276,9 +283,7 @@ const char * iconv_codecvt_facet_exception::what() const throw()
 
 idocfstream::idocfstream(string const & encoding) : base()
 {
-       std::locale global;
-       std::locale locale(global, new iconv_codecvt_facet(encoding, in));
-       imbue(locale);
+       setEncoding(*this, encoding, in);
 }
 
 
@@ -286,19 +291,19 @@ idocfstream::idocfstream(const char* s, std::ios_base::openmode mode,
                         string const & encoding)
        : base()
 {
-       // We must imbue the stream before openening the file
-       std::locale global;
-       std::locale locale(global, new iconv_codecvt_facet(encoding, in));
-       imbue(locale);
+       setEncoding(*this, encoding, in);
        open(s, mode);
 }
 
 
+odocfstream::odocfstream(): base()
+{
+}
+
+
 odocfstream::odocfstream(string const & encoding) : base()
 {
-       std::locale global;
-       std::locale locale(global, new iconv_codecvt_facet(encoding, out));
-       imbue(locale);
+       setEncoding(*this, encoding, out);
 }
 
 
@@ -306,14 +311,18 @@ odocfstream::odocfstream(const char* s, std::ios_base::openmode mode,
                         string const & encoding)
        : base()
 {
-       // We must imbue the stream before openening the file
-       std::locale global;
-       std::locale locale(global, new iconv_codecvt_facet(encoding, out));
-       imbue(locale);
+       setEncoding(*this, encoding, out);
        open(s, mode);
 }
 
 
+void odocfstream::reset(string const & encoding)
+{
+       setEncoding(*this, encoding, out);
+}
+
+
+
 SetEnc setEncoding(string const & encoding)
 {
        return SetEnc(encoding);
@@ -339,6 +348,15 @@ odocstream & operator<<(odocstream & os, SetEnc e)
        return os;
 }
 
+
+#if ! defined(USE_WCHAR_T)
+odocstream & operator<<(odocstream & os, char c)
+{
+       os.put(c);
+       return os;
+}
+#endif
+
 }
 
 #if ! defined(USE_WCHAR_T) && defined(__GNUC__)
@@ -346,21 +364,71 @@ odocstream & operator<<(odocstream & os, SetEnc e)
 // a bug in gcc. The implementation here does not do anything useful, since
 // it is overriden in iconv_codecvt_facet.
 namespace std {
+
 template<> codecvt<lyx::char_type, char, mbstate_t>::result
-codecvt<lyx::char_type, char, mbstate_t>::do_out(mbstate_t &, const lyx::char_type *, const lyx::char_type *, const lyx::char_type *&,
-               char *, char *, char *&) const { return error; }
+codecvt<lyx::char_type, char, mbstate_t>::do_out(
+       mbstate_t &, const lyx::char_type *, const lyx::char_type *,
+       const lyx::char_type *&, char *, char *, char *&) const
+{
+       return error;
+}
+
+
 template<> codecvt<lyx::char_type, char, mbstate_t>::result
-codecvt<lyx::char_type, char, mbstate_t>::do_unshift(mbstate_t &, char *, char *, char *&) const { return error; }
+codecvt<lyx::char_type, char, mbstate_t>::do_unshift(
+       mbstate_t &, char *, char *, char *&) const
+{
+       return error;
+}
+
+
 template<> codecvt<lyx::char_type, char, mbstate_t>::result
-codecvt<lyx::char_type, char, mbstate_t>::do_in(mbstate_t &, const char *, const char *, const char *&,
-               lyx::char_type *, lyx::char_type *, lyx::char_type *&) const { return error; }
-template<> int codecvt<lyx::char_type, char, mbstate_t>::do_encoding() const throw() { return 0; }
-template<> bool codecvt<lyx::char_type, char, mbstate_t>::do_always_noconv() const throw() { return true; }
+codecvt<lyx::char_type, char, mbstate_t>::do_in(
+       mbstate_t &, const char *, const char *, const char *&,
+       lyx::char_type *, lyx::char_type *, lyx::char_type *&) const
+{
+       return error;
+}
+
+
+template<>
+int codecvt<lyx::char_type, char, mbstate_t>::do_encoding() const throw()
+{
+       return 0;
+}
+
+
+template<>
+bool codecvt<lyx::char_type, char, mbstate_t>::do_always_noconv() const throw()
+{
+       return true;
+}
+
 #if __GNUC__ == 3 && __GNUC_MINOR__ < 4
-template<> int codecvt<lyx::char_type, char, mbstate_t>::do_length(mbstate_t const &, const char *, const char *, size_t) const { return 1; }
+
+template<>
+int codecvt<lyx::char_type, char, mbstate_t>::do_length(
+       mbstate_t const &, const char *, const char *, size_t) const
+{
+       return 1;
+}
+
 #else
-template<> int codecvt<lyx::char_type, char, mbstate_t>::do_length(mbstate_t &, const char *, const char *, size_t) const { return 1; }
+
+template<>
+int codecvt<lyx::char_type, char, mbstate_t>::do_length(
+       mbstate_t &, const char *, const char *, size_t) const
+{
+       return 1;
+}
+
 #endif
-template<> int codecvt<lyx::char_type, char, mbstate_t>::do_max_length() const throw() { return 4; }
+
+template<>
+int codecvt<lyx::char_type, char, mbstate_t>::do_max_length() const throw()
+{
+       return 4;
 }
+
+} // namespace std
 #endif