* gcc does not like missing characters in keywords

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index d26bd2a89337464db24cbdadcfe0dc369f24dc28..caf7b65d68fefc632a3b6ebd6136481f2f208625 100644 (file)
--- a/src/Text.h
+++ b/src/Text.h
@@ -25,10 +25,10 @@ class CursorSlice;
 class DocIterator;
 class ErrorList;
 class Font;
+class FontInfo;
 class FuncRequest;
 class FuncStatus;
 class Inset;
-class Color_color;
 class Cursor;
 class Lexer;
 class PainterInfo;
@@ -47,9 +47,9 @@ public:
        bool empty() const;
 
        ///
-       Font getLayoutFont(Buffer const & buffer, pit_type pit) const;
+       FontInfo getLayoutFont(Buffer const & buffer, pit_type pit) const;
        ///
-       Font getLabelFont(Buffer const & buffer,
+       FontInfo getLabelFont(Buffer const & buffer,
                Paragraph const & par) const;
        /** Set font of character at position \p pos in paragraph \p pit.
         *  Must not be called if \p pos denotes an inset with text contents,
@@ -163,20 +163,20 @@ public:
        ///
        void recUndo(Cursor & cur, pit_type first) const;
 
-       /// Move cursor one position left
+       /// Move cursor one position backwards
        /**
         * Returns true if an update is needed after the move.
         */
-       bool cursorLeft(Cursor & cur);
-       /// Move cursor one position right
+       bool cursorBackward(Cursor & cur);
+       /// Move cursor one position forward
        /**
         * Returns true if an update is needed after the move.
         */
-       bool cursorRight(Cursor & cur);
+       bool cursorForward(Cursor & cur);
        ///
-       bool cursorLeftOneWord(Cursor & cur);
+       bool cursorBackwardOneWord(Cursor & cur);
        ///
-       bool cursorRightOneWord(Cursor & cur);
+       bool cursorForwardOneWord(Cursor & cur);
        /// Delete from cursor up to the end of the current or next word.
        void deleteWordForward(Cursor & cur);
        /// Delete from cursor to start of current or prior word.
@@ -200,15 +200,6 @@ public:
        bool dissolveInset(Cursor & cur);
        ///
        bool selectWordWhenUnderCursor(Cursor & cur, word_location);
-       ///
-       enum TextCase {
-               ///
-               text_lowercase = 0,
-               ///
-               text_capitalization = 1,
-               ///
-               text_uppercase = 2
-       };
        /// Change the case of the word at cursor position.
        void changeCase(Cursor & cur, TextCase action);
        /// Transposes the character at the cursor with the one before it