X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FRowPainter.h;h=918fc9f9895c0572a3dc4f0888cf213241c46d6f;hb=e4b80698be91708ce1b9fd86d6032245ef4f3dc7;hp=05ab57c51bc3d81b839eaff15d82fb9e00f8c967;hpb=e39e4cf96b23997c065a890c015138eb93a1d4fd;p=lyx.git

diff --git a/src/RowPainter.h b/src/RowPainter.h
index 05ab57c51b..918fc9f989 100644
--- a/src/RowPainter.h
+++ b/src/RowPainter.h
@@ -14,27 +14,15 @@
 #ifndef ROWPAINTER_H
 #define ROWPAINTER_H
 
-#include "Changes.h"
 #include "Row.h"
 
-#include "support/types.h"
-
 namespace lyx {
 
-class BufferView;
-class Font;
-class FontInfo;
-class Inset;
-class Language;
 class PainterInfo;
 class Paragraph;
-class ParagraphList;
-class ParagraphMetrics;
 class Text;
 class TextMetrics;
 
-namespace frontend { class Painter; }
-
 /**
  * A class used for painting an individual row of text.
  * FIXME: get rid of that class.
@@ -56,17 +44,21 @@ public:
 	void paintText();
 	void paintOnlyInsets();
 	void paintSelection() const;
+	void paintBookmark(int num) const;
 
 private:
+	void paintLanguageMarkings(Row::Element const & e) const;
 	void paintForeignMark(Row::Element const & e) const;
+	void paintNoSpellingMark(Row::Element const & e) const;
 	void paintStringAndSel(Row::Element const & e) const;
+	void paintTextDecoration(Row::Element const & e) const;
 	void paintMisspelledMark(Row::Element const & e) const;
 	void paintChange(Row::Element const & e) const;
 	void paintAppendixStart(int y) const;
 	void paintInset(Row::Element const & e) const;
 
-	/// return the label font for this row
-	FontInfo labelFont() const;
+	/// return the label font for this row (end label when \c end is true)
+	FontInfo labelFont(bool end) const;
 
 	///
 	void paintLabel() const;
@@ -79,27 +71,18 @@ private:
 
 	/// Text for the row
 	Text const & text_;
-	TextMetrics const & text_metrics_;
-	ParagraphList const & pars_;
+	TextMetrics const & tm_;
 
 	/// The row to paint
 	Row const & row_;
 
 	/// Row's paragraph
 	Paragraph const & par_;
-	ParagraphMetrics const & pm_;
-
-	/// row changed? (change tracking)
-	Change const change_;
 
 	// Looks ugly - is
 	double const xo_;
 	int const yo_;    // current baseline
 	double x_;
-	int width_;
-	int solid_line_thickness_;
-	int solid_line_offset_;
-	int dotted_line_thickness_;
 };
 
 } // namespace lyx