X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex_pimpl.h;h=c844fb4c1ca56d4a3baecdd5d44d1032e8250c4d;hb=9667cb383640866f47aea57f059a9d2a5caefc3d;hp=797605dc08f0002405a9e57789ea7509c4282f66;hpb=c38c00230ca8a66b74ca0c82cd07303fb23ea7b5;p=lyx.git diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h index 797605dc08..c844fb4c1c 100644 --- a/src/lyxlex_pimpl.h +++ b/src/lyxlex_pimpl.h @@ -14,9 +14,12 @@ #include "lyxlex.h" -#ifdef USE_COMPRESSION -# include "support/gzstream.h" -#endif +#include "support/types.h" + +# include +# include +# include +namespace io = boost::iostreams; #include @@ -24,6 +27,11 @@ #include #include + +namespace lyx { + +namespace support { class FileName; } + /// class LyXLex::Pimpl : boost::noncopyable { public: @@ -32,6 +40,8 @@ public: /// std::string const getString() const; /// + docstring const getDocString() const; + /// void printError(std::string const & message) const; /// void printTable(std::ostream & os); @@ -40,7 +50,7 @@ public: /// void popTable(); /// - bool setFile(std::string const & filename); + bool setFile(support::FileName const & filename); /// void setStream(std::istream & i); /// @@ -60,10 +70,8 @@ public: /// fb_ is only used to open files, the stream is accessed through is. std::filebuf fb_; -#ifdef USE_COMPRESSION /// gz_ is only used to open files, the stream is accessed through is. - gz::gzstreambuf gz_; -#endif + io::filtering_istreambuf gz_; /// the stream that we use. std::istream is; @@ -74,7 +82,7 @@ public: /// int no_items; /// - std::vector buff; + std::string buff; /// int status; /// @@ -103,4 +111,7 @@ private: /// std::stack pushed; }; + +} // namespace lyx + #endif