more cursor dispatch

[lyx.git] / src / lyxlex_pimpl.h

diff --git a/src/lyxlex_pimpl.h b/src/lyxlex_pimpl.h
index bc5876aba61f1e82dfaca4b284dfd1cd3b08e406..e3109d158f40df73c221eb11e31352813968b837 100644 (file)
--- a/src/lyxlex_pimpl.h
+++ b/src/lyxlex_pimpl.h
@@ -1,4 +1,13 @@
 // -*- C++ -*-
+/**
+ * \file lyxlex_pimpl.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef LYXLEX_PIMPL_H
 #define LYXLEX_PIMPL_H
@@ -9,7 +18,6 @@
 
 #include <boost/utility.hpp>
 
-#include <fstream>
 #include <stack>
 #include <vector>
 
@@ -18,9 +26,9 @@ struct LyXLex::Pimpl : boost::noncopyable {
        ///
        Pimpl(keyword_item * tab, int num);
        ///
-       string const getString() const;
+       std::string const getString() const;
        ///
-       void printError(string const & message) const;
+       void printError(std::string const & message) const;
        ///
        void printTable(std::ostream & os);
        ///
@@ -28,7 +36,7 @@ struct LyXLex::Pimpl : boost::noncopyable {
        ///
        void popTable();
        ///
-       bool setFile(string const & filename);
+       bool setFile(std::string const & filename);
        ///
        void setStream(std::istream & i);
        ///
@@ -44,16 +52,16 @@ struct LyXLex::Pimpl : boost::noncopyable {
        ///
        bool nextToken();
        ///
-       void pushToken(string const &);
-       /// fb__ is only used to open files, the stream is accessed through is.
-       std::filebuf fb__;
-       /// gz__ is only used to open files, the stream is accessed through is.
-       gz::gzstreambuf gz__;
+       void pushToken(std::string const &);
+       /// fb_ is only used to open files, the stream is accessed through is.
+       std::filebuf fb_;
+       /// gz_ is only used to open files, the stream is accessed through is.
+       gz::gzstreambuf gz_;
 
        /// the stream that we use.
        std::istream is;
        ///
-       string name;
+       std::string name;
        ///
        keyword_item * table;
        ///
@@ -65,7 +73,7 @@ struct LyXLex::Pimpl : boost::noncopyable {
        ///
        int lineno;
        ///
-       string pushTok;
+       std::string pushTok;
        ///
        char commentChar;
 private: