#include "Cursor.h"
#include "debug.h"
#include "Language.h"
-#include "LColor.h"
-#include "LyXFont.h"
+#include "Color.h"
+#include "Font.h"
#include "LyXRC.h"
#include "Row.h"
-#include "LyXText.h"
+#include "Text.h"
#include "LyXView.h"
#include "MetricsInfo.h"
#include "Paragraph.h"
}
-void WorkArea::processKeySym(LyXKeySymPtr key, key_modifier::state state)
+void WorkArea::processKeySym(KeySymbolPtr key, key_modifier::state state)
{
// In order to avoid bad surprise in the middle of an operation, we better stop
// the blinking cursor.
CursorShape shape = BAR_SHAPE;
- LyXText const & text = *buffer_view_->cursor().innerText();
- LyXFont const & realfont = text.real_current_font;
+ Text const & text = *buffer_view_->cursor().innerText();
+ Font const & realfont = text.real_current_font;
BufferParams const & bp = buffer_view_->buffer()->params();
bool const samelang = realfont.language() == bp.language;
bool const isrtl = realfont.isVisibleRightToLeft();
if (realfont.language() == latex_language)
shape = BAR_SHAPE;
- LyXFont const font = buffer_view_->cursor().getFont();
+ Font const font = buffer_view_->cursor().getFont();
FontMetrics const & fm = theFontMetrics(font);
int const asc = fm.maxAscent();
int const des = fm.maxDescent();