#include "frontends/Application.h"
#include "frontends/FontMetrics.h"
-#include "funcrequest.h"
-#include "lyxfunc.h"
+#include "FuncRequest.h"
+#include "LyXFunc.h"
#include "Painter.h"
#include "BufferView.h"
-#include "buffer.h"
-#include "bufferparams.h"
-#include "coordcache.h"
-#include "cursor.h"
+#include "Buffer.h"
+#include "BufferParams.h"
+#include "CoordCache.h"
+#include "Cursor.h"
#include "debug.h"
-#include "language.h"
-#include "LColor.h"
-#include "lyxfont.h"
-#include "lyxrc.h"
-#include "lyxrow.h"
-#include "lyxtext.h"
+#include "Language.h"
+#include "Color.h"
+#include "Font.h"
+#include "LyXRC.h"
+#include "Row.h"
+#include "Text.h"
#include "LyXView.h"
-#include "metricsinfo.h"
-#include "paragraph.h"
+#include "MetricsInfo.h"
+#include "Paragraph.h"
#include "rowpainter.h"
#include "gettext.h"
-#include "support/forkedcontr.h"
+#include "support/ForkedcallsController.h"
#include <boost/utility.hpp>
#include <boost/bind.hpp>
}
-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();