* support/qstring_helpers.h: erase ucs4_to_qstring() method.

[lyx.git] / src / lyxlex.h

diff --git a/src/lyxlex.h b/src/lyxlex.h
index f33e077919c5e0a45afc4ddf4a04491c855e5ac9..0c1469a9eec86c6e541bbe803f6601f35992400f 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -26,6 +26,7 @@
 
 namespace lyx {
 
+namespace support { class FileName; }
 
 ///
 struct keyword_item {
@@ -60,13 +61,17 @@ public:
        };
 
        /// stream is open and end of stream is not reached
+       /// FIXME: Rename to good() since this is the name of the
+       /// corresponding std::stream method.
        bool isOK() const;
        /// stream is ok
+       /// FIXME: This does not behave like the std::stream counterpart.
        operator void const *() const;
        /// stream is not ok
+       /// FIXME: This does not behave like the std::stream counterpart.
        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);
        ///
@@ -138,6 +143,8 @@ public:
 
        /// extract string
        LyXLex & operator>>(std::string &);
+       /// extract docstring
+       LyXLex & operator>>(docstring &);
        /// extract double
        LyXLex & operator>>(double &);
        /// extract integer