Remove unused macros USE_INCLUDED_STRING and STD_STRING_IS_GOOD

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

diff --git a/src/support/docstream.h b/src/support/docstream.h
index f5245ec52175e7b05c151a348414baa54273b010..c3a82260144ea665fff864853037e582c08e20c3 100644 (file)
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -45,9 +45,10 @@ typedef std::basic_ostream<char_type> odocstream;
 class idocfstream : public std::basic_ifstream<char_type> {
        typedef std::basic_ifstream<char_type> base;
 public:
-       idocfstream();
+       idocfstream(std::string const & encoding = "UTF-8");
        explicit idocfstream(const char* s,
-               std::ios_base::openmode mode = std::ios_base::in);
+               std::ios_base::openmode mode = std::ios_base::in,
+               std::string const & encoding = "UTF-8");
        ~idocfstream() {}
 };
 
@@ -56,11 +57,13 @@ public:
 class odocfstream : public std::basic_ofstream<char_type> {
        typedef std::basic_ofstream<char_type> base;
 public:
-       odocfstream(std::string const & encoding = "UTF-8");
+       odocfstream();
        explicit odocfstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::out|std::ios_base::trunc,
                std::string const & encoding = "UTF-8");
        ~odocfstream() {}
+       ///
+       void reset(std::string const & encoding);
 };
 
 /// UCS4 input stringstream
@@ -69,12 +72,24 @@ 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) {}
+       std::string encoding;
+};
+
+/// Helper function for changing stream encoding
+SetEnc setEncoding(std::string const & encoding);
+
+/** Change the encoding of \p os to \p e.encoding.
+    \p e.encoding must be a valid iconv name of an 8bit encoding.
+    This does nothing if the stream is not a file stream, since only
+    file streams do have an associated 8bit encoding.
+    Usage: \code
+    os << setEncoding("ISO-8859-1");
+    \endcode
+ */
+odocstream & operator<<(odocstream & os, SetEnc e);
 
 }