fix merge build src/frontends/qt4/QDocument.cpp

[lyx.git] / src / frontends / WorkArea.cpp

diff --git a/src/frontends/WorkArea.cpp b/src/frontends/WorkArea.cpp
index 3aedb40fd232bafb9199b029bc80fc9841fd0d0f..318c059169aaabc43ac8029f0e8cd3753a8d0e90 100644 (file)
--- a/src/frontends/WorkArea.cpp
+++ b/src/frontends/WorkArea.cpp
@@ -26,21 +26,21 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "CoordCache.h"
-#include "LCursor.h"
+#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"
 #include "rowpainter.h"
 
 #include "gettext.h"
-#include "support/forkedcontr.h"
+#include "support/ForkedcallsController.h"
 
 #include <boost/utility.hpp>
 #include <boost/bind.hpp>
@@ -165,7 +165,7 @@ void WorkArea::redraw()
 }
 
 
-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.
@@ -280,8 +280,8 @@ void WorkArea::showCursor()
 
        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();
@@ -296,7 +296,7 @@ void WorkArea::showCursor()
        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();