reduce number of metrics calls in InsetTabular calculate_dimensions_

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

diff --git a/src/insets/inset.C b/src/insets/inset.C
index c5cc6ad5d3ef61d8f38e3f70f2e18813a79fde8c..82f19f801cd7849f217a9348aa05fd8bab62d2fe 100644 (file)
--- a/src/insets/inset.C
+++ b/src/insets/inset.C
@@ -22,6 +22,8 @@
 #include "dimension.h"
 #include "metricsinfo.h"
 
+#include "insets/updatableinset.h"
+
 #include "frontends/Painter.h"
 #include "frontends/mouse_state.h"
 
@@ -60,10 +62,6 @@ Inset::EDITABLE Inset::editable() const
 }
 
 
-void Inset::validate(LaTeXFeatures &) const
-{}
-
-
 bool Inset::autoDelete() const
 {
        return false;
@@ -88,7 +86,7 @@ string const Inset::editMessage() const
 }
 
 
-LyXText * Inset::getLyXText(BufferView const * bv, bool const) const
+LyXText * Inset::getLyXText(BufferView const * bv, bool /*recursive*/) const
 {
        if (owner())
                return owner()->getLyXText(bv, false);
@@ -147,9 +145,7 @@ int Inset::latexTextWidth(BufferView * bv) const
 int Inset::ascent(BufferView * bv, LyXFont const & font) const
 {
        Dimension dim;
-       MetricsInfo mi;
-       mi.base.bv = bv;
-       mi.base.font = font;
+       MetricsInfo mi(bv, font);
        metrics(mi, dim);
        return dim.ascent();
 }
@@ -158,9 +154,7 @@ int Inset::ascent(BufferView * bv, LyXFont const & font) const
 int Inset::descent(BufferView * bv, LyXFont const & font) const
 {
        Dimension dim;
-       MetricsInfo mi;
-       mi.base.bv = bv;
-       mi.base.font = font;
+       MetricsInfo mi(bv, font);
        metrics(mi, dim);
        return dim.descent();
 }
@@ -169,9 +163,7 @@ int Inset::descent(BufferView * bv, LyXFont const & font) const
 int Inset::width(BufferView * bv, LyXFont const & font) const
 {
        Dimension dim;
-       MetricsInfo mi;
-       mi.base.bv = bv;
-       mi.base.font = font;
+       MetricsInfo mi(bv, font);
        metrics(mi, dim);
        return dim.width();
 }