pimpl not needed here

[lyx.git] / src / insets / RenderPreview.cpp

diff --git a/src/insets/RenderPreview.cpp b/src/insets/RenderPreview.cpp
index cba453df10b22872421260e7a02878bc58a68262..d21f638eee19588b40df7bcdae8972dc3a5145b9 100644 (file)
--- a/src/insets/RenderPreview.cpp
+++ b/src/insets/RenderPreview.cpp
@@ -14,7 +14,6 @@
 #include "insets/Inset.h"
 
 #include "BufferView.h"
-#include "Color.h"
 #include "Dimension.h"
 #include "gettext.h"
 #include "LyX.h"
@@ -119,7 +118,7 @@ RenderPreview::getPreviewImage(Buffer const & buffer) const
 }
 
 
-bool RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
+void RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        BOOST_ASSERT(mi.base.bv);
 
@@ -134,16 +133,14 @@ bool RenderPreview::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.asc = 50;
                dim.des = 0;
 
-               Font font(mi.base.font);
-               font.setFamily(Font::SANS_FAMILY);
-               font.setSize(Font::SIZE_FOOTNOTE);
+               FontInfo font(mi.base.font);
+               font.setFamily(SANS_FAMILY);
+               font.setSize(FONT_SIZE_FOOTNOTE);
                docstring const stat = statusMessage(mi.base.bv, snippet_);
                dim.wid = 15 + theFontMetrics(font).width(stat);
        }
 
-       bool const changed = dim_ != dim;
        dim_ = dim;
-       return changed;
 }
 
 
@@ -166,11 +163,11 @@ void RenderPreview::draw(PainterInfo & pi, int x, int y) const
                                  y - dim_.asc,
                                  dim_.wid - 2 * offset,
                                  dim_.asc + dim_.des,
-                                 Color::foreground);
+                                 Color_foreground);
 
-               Font font(pi.base.font);
-               font.setFamily(Font::SANS_FAMILY);
-               font.setSize(Font::SIZE_FOOTNOTE);
+               FontInfo font(pi.base.font);
+               font.setFamily(SANS_FAMILY);
+               font.setSize(FONT_SIZE_FOOTNOTE);
 
                docstring const stat = statusMessage(pi.base.bv, snippet_);
                pi.pain.text(x + offset + 6,