Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / RowPainter.h

diff --git a/src/RowPainter.h b/src/RowPainter.h
index a4120e6dfd81f38eaf65621cab5fc1d320d22b44..ca719bd228e1b06ca249a0c9c5c3493e8fdbe6bb 100644 (file)
--- a/src/RowPainter.h
+++ b/src/RowPainter.h
@@ -43,7 +43,7 @@ class RowPainter {
 public:
        /// initialise and run painter
        RowPainter(PainterInfo & pi, Text const & text,
-               pit_type pit, Row const & row, int x, int y);
+                  Row const & row, int x, int y);
 
        /// paint various parts
        /// FIXME: transfer to TextMetrics
@@ -52,20 +52,18 @@ public:
        void paintChangeBar() const;
        void paintTooLargeMarks(bool const left, bool const right) const;
        void paintFirst() const;
-       void paintLast();
+       void paintLast() const;
        void paintText();
        void paintOnlyInsets();
        void paintSelection() const;
 
 private:
-       void paintSeparator(double width, Font const & font);
-       void paintForeignMark(double orig_x, Language const * lang, int desc = 0) const;
-       void paintStringAndSel(Row::Element const & e);
-       void paintMisspelledMark(double orig_x, Row::Element const & e) const;
-       void paintChange(double orig_x , Font const & font, Change const & change) const;
+       void paintForeignMark(Row::Element const & e) const;
+       void paintStringAndSel(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(Inset const * inset, Font const & font,
-                    Change const & change, pos_type const pos);
+       void paintInset(Row::Element const & e) const;
 
        /// return the label font for this row
        FontInfo labelFont() const;
@@ -88,7 +86,6 @@ private:
        Row const & row_;
 
        /// Row's paragraph
-       pit_type const pit_;
        Paragraph const & par_;
        ParagraphMetrics const & pm_;
 
@@ -100,9 +97,6 @@ private:
        int const yo_;    // current baseline
        double x_;
        int width_;
-       int solid_line_thickness_;
-       int solid_line_offset_;
-       int dotted_line_thickness_;
 };
 
 } // namespace lyx