X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex.h;h=0c1469a9eec86c6e541bbe803f6601f35992400f;hb=8765ab59cdddad67284007813ef25934ea0042ce;hp=18a95aa26a4e2c29cdb25556821429da60a6b7ae;hpb=9080c444582799a9967fb27a5eee08931bd3a323;p=lyx.git

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 18a95aa26a..0c1469a9ee 100644
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -24,6 +24,10 @@
 #include <iosfwd>
 
 
+namespace lyx {
+
+namespace support { class FileName; }
+
 ///
 struct keyword_item {
 	///
@@ -57,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);
 	///
@@ -102,7 +110,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 +143,8 @@ public:
 
 	/// extract string
 	LyXLex & operator>>(std::string &);
+	/// extract docstring
+	LyXLex & operator>>(docstring &);
 	/// extract double
 	LyXLex & operator>>(double &);
 	/// extract integer
@@ -182,4 +192,7 @@ public:
 #define pushpophelper(x, y, z) unnamed_pushpophelper;
 // Tip gotten from Bobby Schmidt's column in C/C++ Users Journal
 
+
+} // namespace lyx
+
 #endif