simplify paintText() interface.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15590 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiWorkArea.C b/src/frontends/qt4/GuiWorkArea.C
index 8cc2c88a6a84c4528a4f466f92e7f5b1ed3eae54..0fed2bf19da5d763e6d872877b4987d8fb27ac37 100644 (file)
--- a/src/frontends/qt4/GuiWorkArea.C
+++ b/src/frontends/qt4/GuiWorkArea.C
@@ -594,8 +594,7 @@ void GuiWorkArea::paintEvent(QPaintEvent * ev)
 
        //lyxerr << "real drawing" << endl;
        QLPainter pain(viewport());
-       ViewMetricsInfo const & vi = buffer_view_->viewMetricsInfo();
-       paintText(*buffer_view_, vi, pain);
+       paintText(*buffer_view_, pain);
 }
 
 

diff --git a/src/rowpainter.C b/src/rowpainter.C
index 5eed74d9a79369634f6286b061c0fccb7c8609c7..c38fa06248d3a6e6c6fe83ebd2c4ed934285b4fc 100644 (file)
--- a/src/rowpainter.C
+++ b/src/rowpainter.C
@@ -895,13 +895,14 @@ void paintPar
 } // namespace anon
 
 
-void paintText(BufferView & bv, ViewMetricsInfo const & vi,
+void paintText(BufferView & bv,
               Painter & pain)
 {
        BOOST_ASSERT(bv.buffer());
        LyXText & text = bv.buffer()->text();
        bool const select = bv.cursor().selection();
-
+       ViewMetricsInfo const & vi = bv.viewMetricsInfo();
+       
        PainterInfo pi(const_cast<BufferView *>(&bv), pain);
        // Should the whole screen, including insets, be refreshed?
        bool repaintAll = select || !vi.singlepar;

diff --git a/src/rowpainter.h b/src/rowpainter.h
index 21983e2f6b7977d610d3c7fce4892e7958277900..d9feb9a8b95fc170630d717140fe4e441efa3c0e 100644 (file)
--- a/src/rowpainter.h
+++ b/src/rowpainter.h
@@ -26,8 +26,7 @@ class ViewMetricsInfo;
 namespace frontend { class Painter; }
 
 /// paint visible paragraph of main text
-void paintText(BufferView & bv, ViewMetricsInfo const & vi,
-                          frontend::Painter & painter);
+void paintText(BufferView & bv, frontend::Painter & painter);
 
 /// paint the rows of a text inset
 void paintTextInset(LyXText const & text, PainterInfo & pi, int x, int y);