Let paragraph::requestSpellcheck() consider contained insets

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

diff --git a/src/support/docstream.h b/src/support/docstream.h
index a6197cccd6789812760a90238d5a97dee56fcefc..700601c42815fd87414da9f89e59b6d5609e4ef7 100644 (file)
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -21,8 +21,8 @@ namespace lyx {
 
 class iconv_codecvt_facet_exception : public std::exception {
 public:
-       virtual ~iconv_codecvt_facet_exception() throw() {}
-       virtual const char * what() const throw();
+       virtual ~iconv_codecvt_facet_exception() noexcept {}
+       const char * what() const noexcept override;
 };
 
 /// Base class for UCS4 input streams
@@ -40,6 +40,8 @@ typedef std::basic_istream<char_type> idocstream;
  */
 typedef std::basic_ostream<char_type> odocstream;
 
+struct SetEnc;
+
 /// File stream for reading UTF8-encoded files with automatic conversion to
 /// UCS4.
 /// Buffering must be switched off if the encoding is changed after
@@ -48,6 +50,9 @@ class ifdocstream : public std::basic_ifstream<char_type> {
        typedef std::basic_ifstream<char_type> base;
 public:
        ifdocstream();
+       /// Create a stream with a specific encoding \p enc.
+       /// We must not pass \p enc as string, to avoid confusing it with a file name.
+       explicit ifdocstream(SetEnc const & enc);
        explicit ifdocstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::in,
                std::string const & encoding = "UTF-8");
@@ -61,6 +66,9 @@ class ofdocstream : public std::basic_ofstream<char_type> {
        typedef std::basic_ofstream<char_type> base;
 public:
        ofdocstream();
+       /// Create a stream with a specific encoding \p enc.
+       /// We must not pass \p enc as string, to avoid confusing it with a file name.
+       explicit ofdocstream(SetEnc const & enc);
        explicit ofdocstream(const char* s,
                std::ios_base::openmode mode = std::ios_base::out|std::ios_base::trunc,
                std::string const & encoding = "UTF-8");
@@ -103,9 +111,9 @@ SetEnc setEncoding(std::string const & encoding);
     os << setEncoding("ISO-8859-1");
     \endcode
  */
-odocstream & operator<<(odocstream & os, SetEnc e);
-idocstream & operator<<(idocstream & os, SetEnc e);
+odocstream & operator<<(odocstream & os, SetEnc const & e);
+idocstream & operator<<(idocstream & os, SetEnc const & e);
 
-}
+} // namespace lyx
 
 #endif