Clean up InsetGraphics::Cache and rename as GraphicsInset.

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index 700121dc5aaeedb59e3abfb987da3436dab2e819..a69f1f8884baa8d348423ed2d986c68b395a71a0 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -20,6 +20,7 @@
 #include "lyxfont.h"
 #include "lyxtext.h"
 #include "dimension.h"
+#include "metricsinfo.h"
 
 #include "frontends/Painter.h"
 #include "frontends/mouse_state.h"
@@ -47,18 +48,6 @@ Inset::Inset(Inset const & in)
 }
 
 
-// Inset::Inset(Inset const & in, bool same_id)
-//     : InsetBase(),
-//     top_x(0), top_baseline(0), scx(0), owner_(0),
-//     name_(in.name_), background_color_(in.background_color_)
-// {
-//     if (same_id)
-//             id_ = in.id();
-//     else
-//             id_ = inset_id++;
-// }
-
-
 bool Inset::directWrite() const
 {
        return false;
@@ -71,10 +60,6 @@ Inset::EDITABLE Inset::editable() const
 }
 
 
-void Inset::validate(LaTeXFeatures &) const
-{}
-
-
 bool Inset::autoDelete() const
 {
        return false;
@@ -158,7 +143,10 @@ int Inset::latexTextWidth(BufferView * bv) const
 int Inset::ascent(BufferView * bv, LyXFont const & font) const
 {
        Dimension dim;
-       dimension(bv, font, dim);
+       MetricsInfo mi;
+       mi.base.bv = bv;
+       mi.base.font = font;
+       metrics(mi, dim);
        return dim.ascent();
 }
 
@@ -166,7 +154,10 @@ int Inset::ascent(BufferView * bv, LyXFont const & font) const
 int Inset::descent(BufferView * bv, LyXFont const & font) const
 {
        Dimension dim;
-       dimension(bv, font, dim);
+       MetricsInfo mi;
+       mi.base.bv = bv;
+       mi.base.font = font;
+       metrics(mi, dim);
        return dim.descent();
 }
 
@@ -174,6 +165,9 @@ int Inset::descent(BufferView * bv, LyXFont const & font) const
 int Inset::width(BufferView * bv, LyXFont const & font) const
 {
        Dimension dim;
-       dimension(bv, font, dim);
+       MetricsInfo mi;
+       mi.base.bv = bv;
+       mi.base.font = font;
+       metrics(mi, dim);
        return dim.width();
 }