* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / lyxlex.h

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 18a95aa26a4e2c29cdb25556821429da60a6b7ae..7f6cc26e0225487f7b5da7ffa47bb1d95bce774d 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -24,6 +24,10 @@
 #include <iosfwd>
 
 
+namespace lyx {
+
+namespace support { class FileName; }
+
 ///
 struct keyword_item {
        ///
@@ -63,7 +67,7 @@ public:
        /// stream is not ok
        bool operator!() const;
        /// return true if able to open file, else false
-       bool setFile(std::string const & filename);
+       bool setFile(support::FileName const & filename);
        ///
        void setStream(std::istream & is);
        ///
@@ -102,7 +106,7 @@ public:
        std::string const getString() const;
 
        ///
-       lyx::docstring const getDocString() const;
+       docstring const getDocString() const;
 
        /** Get a long string, ended by the tag `endtag'.
            This string can span several lines. The first line
@@ -135,6 +139,8 @@ public:
 
        /// extract string
        LyXLex & operator>>(std::string &);
+       /// extract docstring
+       LyXLex & operator>>(docstring &);
        /// extract double
        LyXLex & operator>>(double &);
        /// extract integer
@@ -182,4 +188,7 @@ public:
 #define pushpophelper(x, y, z) unnamed_pushpophelper;
 // Tip gotten from Bobby Schmidt's column in C/C++ Users Journal
 
+
+} // namespace lyx
+
 #endif