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 f708b80bd991f5d352755ec3631256a7d644187f..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"
@@ -59,10 +60,6 @@ Inset::EDITABLE Inset::editable() const
 }
 
 
-void Inset::validate(LaTeXFeatures &) const
-{}
-
-
 bool Inset::autoDelete() const
 {
        return false;
@@ -146,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();
 }
 
@@ -154,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();
 }
 
@@ -162,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();
 }