hopefully fix tex2lyx linking.

[lyx.git] / src / insets / render_graphic.C

diff --git a/src/insets/render_graphic.C b/src/insets/render_graphic.C
index 442d89d5a3693ae1a28da928d1abc8d6f6360e05..d940d782da21114ad87320e3234f20aa2932302b 100644 (file)
--- a/src/insets/render_graphic.C
+++ b/src/insets/render_graphic.C
@@ -20,7 +20,7 @@
 #include "lyxrc.h"
 #include "metricsinfo.h"
 
-#include "frontends/font_metrics.h"
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 #include "graphics/GraphicsImage.h"
@@ -29,11 +29,11 @@
 
 #include <boost/bind.hpp>
 
-namespace graphics = lyx::graphics;
 
-using lyx::docstring;
-using lyx::support::absolutePath;
-using lyx::support::onlyFilename;
+namespace lyx {
+
+using support::absolutePath;
+using support::onlyFilename;
 
 using std::string;
 using std::auto_ptr;
@@ -83,7 +83,7 @@ bool displayGraphic(graphics::Params const & params)
 }
 
 
-string const statusMessage(graphics::Params const & params,
+docstring const statusMessage(graphics::Params const & params,
                           graphics::ImageStatus status)
 {
        docstring ret;
@@ -128,8 +128,7 @@ string const statusMessage(graphics::Params const & params,
                }
        }
 
-       // FIXME UNICODE
-       return lyx::to_utf8(ret);
+       return ret;
 }
 
 
@@ -159,19 +158,20 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
                LyXFont msgFont(mi.base.font);
                msgFont.setFamily(LyXFont::SANS_FAMILY);
 
-               string const justname = onlyFilename(params_.filename);
-               docstring djust(justname.begin(), justname.end());
+               // FIXME UNICODE
+               docstring const justname = 
+                       from_utf8(onlyFilename(params_.filename));
                if (!justname.empty()) {
                        msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
-                       font_width = font_metrics::width(djust, msgFont);
+                       font_width = theFontMetrics(msgFont)
+                               .width(justname);
                }
 
-               string const msg = statusMessage(params_, loader_.status());
+               docstring const msg = statusMessage(params_, loader_.status());
                if (!msg.empty()) {
-                       docstring dmsg(msg.begin(), msg.end());
                        msgFont.setSize(LyXFont::SIZE_TINY);
                        font_width = std::max(font_width,
-                                             font_metrics::width(dmsg, msgFont));
+                               theFontMetrics(msgFont).width(msg));
                }
 
                dim.wid = std::max(50, font_width + 15);
@@ -213,20 +213,21 @@ void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
                string const justname = onlyFilename(params_.filename);
 
                if (!justname.empty()) {
-                       docstring djust(justname.begin(), justname.end());
                        msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
                        pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6,
-                                  y - font_metrics::maxAscent(msgFont) - 4,
-                                  djust, msgFont);
+                                  y - theFontMetrics(msgFont).maxAscent() - 4,
+                                  from_utf8(justname), msgFont);
                }
 
                // Print the message.
-               string const msg = statusMessage(params_, loader_.status());
+               docstring const msg = statusMessage(params_, loader_.status());
                if (!msg.empty()) {
-                       docstring dmsg(msg.begin(), msg.end());
                        msgFont.setSize(LyXFont::SIZE_TINY);
                        pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6,
-                                    y - 4, dmsg, msgFont);
+                                    y - 4, msg, msgFont);
                }
        }
 }
+
+
+} // namespace lyx