* gcc does not like missing characters in keywords

[lyx.git] / src / Lexer.h

diff --git a/src/Lexer.h b/src/Lexer.h
index a8da886c8ffb470e02f1cbe1273840ff85f6da39..fbe27602c812fd49ca586a63768ec4d6cbe754c8 100644 (file)
--- a/src/Lexer.h
+++ b/src/Lexer.h
@@ -17,9 +17,7 @@
 #ifndef LEXER_H
 #define LEXER_H
 
-#include "support/docstring.h"
-
-#include <boost/utility.hpp>
+#include "support/strfwd.h"
 
 #include <iosfwd>
 
@@ -37,10 +35,10 @@ struct keyword_item {
 };
 
 /** Generalized simple lexical analizer.
-       Use the method isOK() to check if there is still data available 
+       Use the method isOK() to check if there is still data available
        for lexing. Use one of the the operators void* or ! to test if
        the last reading operation was successful.
-       
+
        Example:
 
        int readParam(LyxLex &lex) {
@@ -51,11 +49,11 @@ struct keyword_item {
                        if (lex) param = p; // only use the input if reading was successful
                }
                return param;
-       } 
+       }
 
     @see LyXRC.cpp for an example of usage.
   */
-class Lexer : boost::noncopyable {
+class Lexer {
 public:
        ///
        Lexer(keyword_item *, int);
@@ -76,11 +74,11 @@ public:
 
        /// stream is open and end of stream is not reached
        /// FIXME: test also if pushTok is not empty
-       /// FIXME: the method should be renamed to something like 
+       /// FIXME: the method should be renamed to something like
        ///        dataAvailable(), in order to reflect the real behavior
        bool isOK() const;
        /// FIXME: The next two operators should be replaced by one method
-       ///        called e.g. lastReadOk(), in order to reflect the real 
+       ///        called e.g. lastReadOk(), in order to reflect the real
        ///        behavior
        /// last read operation was successful.
        operator void const *() const;
@@ -175,6 +173,11 @@ public:
        static std::string const quoteString(std::string const &);
 
 private:
+       /// noncopiable
+       Lexer(Lexer const &);
+       void operator=(Lexer const &);
+
+       ///
        class Pimpl;
        ///
        Pimpl * pimpl_;