Some more cleanup of LyXView:

[lyx.git] / src / Text.h

diff --git a/src/Text.h b/src/Text.h
index 6c7c6946adba3daadb93b2d0360926bcc27c3122..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,
@@ -174,9 +174,9 @@ public:
         */
        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.