revert recent change to development/FORMAT (don't change history)

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 8eb3931562fb88622b3d429c3ebdf7cd4e7f792f..4ec3824e002703bbe725d7c394f10254e063a315 100644 (file)
--- a/src/lyxtext.h
+++ b/src/lyxtext.h
@@ -30,6 +30,7 @@ class BufferParams;
 class BufferView;
 class CursorSlice;
 class Dimension;
+class ErrorList;
 class InsetBase;
 class InsetBase_code;
 class FuncRequest;
@@ -50,6 +51,8 @@ public:
        ///
        typedef lyx::pos_type pos_type;
        ///
+       typedef lyx::char_type char_type;
+       ///
        typedef lyx::pit_type pit_type;
 
        /// constructor
@@ -274,7 +277,7 @@ public:
        int singleWidth(Paragraph const & par, pos_type pos) const;
        ///
        int singleWidth(Paragraph const & par,
-               pos_type pos, char c, LyXFont const & Font) const;
+               pos_type pos, char_type c, LyXFont const & Font) const;
 
        /// return the color of the canvas
        LColor_color backgroundColor() const;
@@ -320,7 +323,7 @@ public:
        ///
        void write(Buffer const & buf, std::ostream & os) const;
        /// returns whether we've seen our usual 'end' marker
-       bool read(Buffer const & buf, LyXLex & lex);
+       bool read(Buffer const & buf, LyXLex & lex, ErrorList & errorList);
 
        ///
        int ascent() const;