minimal effort implementation of:

[lyx.git] / src / lyxtext.h

diff --git a/src/lyxtext.h b/src/lyxtext.h
index 59ac616725ba55a5620188bc762a8d0ffc594c74..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
@@ -108,7 +111,7 @@ public:
        std::string getStringToIndex(LCursor const & cur);
 
        /// insert a character at cursor position
-       void insertChar(LCursor & cur, char c);
+       void insertChar(LCursor & cur, lyx::char_type c);
        /// insert an inset at cursor position
        void insertInset(LCursor & cur, InsetBase * inset);
 
@@ -220,8 +223,8 @@ public:
        bool cursorTop(LCursor & cur);
        ///
        bool cursorBottom(LCursor & cur);
-       /// Delete character at cursor. Honour change tracking
-       bool Delete(LCursor & cur);
+       /// Erase character at cursor. Honour change tracking
+       bool erase(LCursor & cur);
        /** At cursor position 0, merge paragraph with the one before it.
         * Ignore CT (this is used in \c acceptChange, \c rejectChange for
         * physical deletion of paragraph break)
@@ -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;
@@ -334,9 +337,6 @@ public:
        /// delete double space or empty paragraphs around old cursor
        bool deleteEmptyParagraphMechanism(LCursor & cur, LCursor & old);
 
-       ///
-       friend class LyXScreen;
-
 public:
        ///
        Dimension dim_;