promote MathMetricsInfo to MetricsInfo, change mathed accordingly

[lyx.git] / src / mathed / math_inset.C

diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index d3a34b39d0649d30a30db8d2f27ccda9ed135ccc..48763a7526387c4ae9180cd9ba444aa0410696a8 100644 (file)
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -34,6 +34,14 @@
 using std::ostream;
 
 
+BufferView * MathInset::view() const
+{
+       if (!mathcursor)
+               return 0;
+       return mathcursor->formula()->view();
+}
+
+
 int MathInset::height() const
 {
        return ascent() + descent();
@@ -158,19 +166,19 @@ bool MathInset::idxBetween(idx_type idx, idx_type from, idx_type to) const
 }
 
 
-void MathInset::metrics(MathMetricsInfo &) const
+void MathInset::metrics(MetricsInfo &) const
 {
        lyxerr << "MathInset::metrics() called directly!\n";
 }
 
 
-void MathInset::draw(MathPainterInfo &, int, int) const
+void MathInset::draw(PainterInfo &, int, int) const
 {
        lyxerr << "MathInset::draw() called directly!\n";
 }
 
 
-void MathInset::drawSelection(MathPainterInfo &,
+void MathInset::drawSelection(PainterInfo &,
        idx_type, pos_type, idx_type, pos_type) const
 {
        lyxerr << "MathInset::drawSelection() called directly!\n";
@@ -207,28 +215,28 @@ void MathInset::normalize(NormalStream & os) const
 }
 
 
-void MathInset::octavize(OctaveStream & os) const
+void MathInset::octave(OctaveStream & os) const
 {
        NormalStream ns(os.os());
        normalize(ns);
 }
 
 
-void MathInset::maplize(MapleStream & os) const
+void MathInset::maple(MapleStream & os) const
 {
        NormalStream ns(os.os());
        normalize(ns);
 }
 
 
-void MathInset::maximize(MaximaStream & os) const
+void MathInset::maxima(MaximaStream & os) const
 {
        MapleStream ns(os.os());
-       maplize(ns);
+       maple(ns);
 }
 
 
-void MathInset::mathematicize(MathematicaStream & os) const
+void MathInset::mathematica(MathematicaStream & os) const
 {
        NormalStream ns(os.os());
        normalize(ns);
@@ -260,13 +268,6 @@ int MathInset::docbook(std::ostream &, bool) const
 }
 
 
-MathInset::result_type
-       MathInset::dispatch(FuncRequest const &, idx_type &, pos_type &)
-{
-       return UNDISPATCHED;
-}
-
-
 string const & MathInset::getType() const
 {
        static string t("none");
@@ -304,8 +305,3 @@ ostream & operator<<(ostream & os, MathAtom const & at)
        return os;
 }
 
-
-Dialogs & getDialogs()
-{
-       return mathcursor->formula()->view()->owner()->getDialogs();
-}