X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlex.h;h=d955d273819bbbdab87e6072238791ed612a77d7;hb=a858be7332e331e0244e4dba7b0931b6072ffd3d;hp=c12afdb2fcda25525f3e0d0478d3833359354f80;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/src/lyxlex.h b/src/lyxlex.h
index c12afdb2fc..d955d27381 100644
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -50,7 +50,7 @@ public:
 	/// file is open and end of file is not reached
 	bool IsOK();
 	/// return true if able to open file, else false
-	bool setFile(LString const & filename);
+	bool setFile(string const & filename);
 	/// if file is already read from, line numbers will be wrong.
 	// should be removed
 	void setFile(FILE *f);
@@ -81,10 +81,10 @@ public:
 	///
 	float GetFloat();
 	///
-	LString GetString() const;
+	string GetString() const;
 	
 	/// get a long string, ended by the tag `endtag'
-	LString getLongString(LString const &endtoken);
+	string getLongString(string const &endtoken);
 	
 	///
 	bool EatLine();
@@ -109,10 +109,10 @@ public:
 	  and file name. If message contains the substring `$$Token',
 	  it is replaced with the value of GetString()
 	  */
-	void printError(LString const & message);
+	void printError(string const & message);
 
 	/**
-	  Prints the current token table on stderr.
+	  Prints the current token table on cerr.
 	  */
 	void printTable();
 protected:
@@ -126,8 +126,8 @@ protected:
 	struct pushed_table {
 		///
 		pushed_table(){
-			next=NULL;
-			table_elem=NULL;
+			next=0;
+			table_elem=0;
 		}
 		///
 		pushed_table *next;
@@ -142,7 +142,7 @@ protected:
         ///
         bool owns_file;
 	/// 
-	LString name;
+	string name;
 	///
 	int lineno;
 	///