Updates from Bennett and myself.

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index 55f9e8c596d480e7c8d9cfa69b203271ddb07183..eb282ef15f5f80278379627137370f9e62049d13 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -28,6 +28,11 @@ namespace io = boost::iostreams;
 #include <stack>
 #include <vector>
 
+
+namespace lyx {
+
+namespace support { class FileName; }
+
 ///
 class LyXLex::Pimpl : boost::noncopyable {
 public:
@@ -36,7 +41,7 @@ public:
        ///
        std::string const getString() const;
        ///
-       lyx::docstring const getDocString() const;
+       docstring const getDocString() const;
        ///
        void printError(std::string const & message) const;
        ///
@@ -46,7 +51,7 @@ public:
        ///
        void popTable();
        ///
-       bool setFile(std::string const & filename);
+       bool setFile(support::FileName const & filename);
        ///
        void setStream(std::istream & i);
        ///
@@ -78,7 +83,7 @@ public:
        ///
        int no_items;
        ///
-       std::vector<char> buff;
+       std::string buff;
        ///
        int status;
        ///
@@ -107,4 +112,7 @@ private:
        ///
        std::stack<pushed_table> pushed;
 };
+
+} // namespace lyx
+
 #endif