ws changes only

[lyx.git] / src / lyxlex.h

diff --git a/src/lyxlex.h b/src/lyxlex.h
index 77babdab04551ca71cc9be762040e4eeacc36a80..98172c6d6c80cfa4dd3a5e2dc7ff5cf9d7d13b2d 100644 (file)
--- a/src/lyxlex.h
+++ b/src/lyxlex.h
@@ -17,10 +17,11 @@
 #ifndef LYXLEX_H
 #define LYXLEX_H
 
+#include <boost/utility.hpp>
+
 #include <iosfwd>
+#include <string>
 
-#include "support/std_string.h"
-#include <boost/utility.hpp>
 
 ///
 struct keyword_item {
@@ -57,7 +58,7 @@ public:
        /// file is open and end of file is not reached
        bool isOK() const;
        /// return true if able to open file, else false
-       bool setFile(string const & filename);
+       bool setFile(std::string const & filename);
        ///
        void setStream(std::istream & is);
        ///
@@ -81,7 +82,7 @@ public:
        */
        bool nextToken();
        /// Push a token, that next token got from lyxlex.
-       void pushToken(string const &);
+       void pushToken(std::string const &);
 
        ///
        int getLineNo() const;
@@ -93,7 +94,7 @@ public:
        ///
        float getFloat() const;
        ///
-       string const getString() const;
+       std::string const getString() const;
 
        /** Get a long string, ended by the tag `endtag'.
            This string can span several lines. The first line
@@ -102,7 +103,7 @@ public:
            each following line. This mechanism does not work
            perfectly if you use tabs.
        */
-       string const getLongString(string const & endtag);
+       std::string const getLongString(std::string const & endtag);
 
        ///
        bool eatLine();
@@ -122,7 +123,7 @@ public:
            and file name. If message contains the substring `$$Token',
            it is replaced with the value of GetString()
        */
-       void printError(string const & message) const;
+       void printError(std::string const & message) const;
 
        /**
           Prints the current token table on the supplied ostream.