tiger support on mac snow leopard, include Qt4 frameworks, smart build script with...

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

diff --git a/src/support/docstream.h b/src/support/docstream.h
index c3db04c58a3a2d2083c55160f6fccc01ee3bdaad..056205df1972a6170214df2e85ab8dda28dede60 100644 (file)
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -42,26 +42,28 @@ typedef std::basic_ostream<char_type> odocstream;
 
 /// File stream for reading UTF8-encoded files with automatic conversion to
 /// UCS4.
-class idocfstream : public std::basic_ifstream<char_type> {
+class ifdocstream : public std::basic_ifstream<char_type> {
        typedef std::basic_ifstream<char_type> base;
 public:
-       idocfstream(std::string const & encoding = "UTF-8");
-       explicit idocfstream(const char* s,
+       ifdocstream();
+       explicit ifdocstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::in,
                std::string const & encoding = "UTF-8");
-       ~idocfstream() {}
+       ~ifdocstream() {}
 };
 
 /// File stream for writing files in 8bit encoding \p encoding with automatic
 /// conversion from UCS4.
-class odocfstream : public std::basic_ofstream<char_type> {
+class ofdocstream : public std::basic_ofstream<char_type> {
        typedef std::basic_ofstream<char_type> base;
 public:
-       odocfstream(std::string const & encoding = "UTF-8");
-       explicit odocfstream(const char* s,
+       ofdocstream();
+       explicit ofdocstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::out|std::ios_base::trunc,
                std::string const & encoding = "UTF-8");
-       ~odocfstream() {}
+       ~ofdocstream() {}
+       ///
+       void reset(std::string const & encoding);
 };
 
 /// UCS4 input stringstream
@@ -70,13 +72,6 @@ typedef std::basic_istringstream<char_type> idocstringstream;
 /// UCS4 output stringstream
 typedef std::basic_ostringstream<char_type> odocstringstream;
 
-inline
-odocstream & operator<<(odocstream & os, char c)
-{
-    os.put(c);
-    return os;
-}
-
 /// Helper struct for changing stream encoding
 struct SetEnc {
        SetEnc(std::string const & e) : encoding(e) {}
@@ -95,6 +90,7 @@ SetEnc setEncoding(std::string const & encoding);
     \endcode
  */
 odocstream & operator<<(odocstream & os, SetEnc e);
+idocstream & operator<<(idocstream & os, SetEnc e);
 
 }