rename LyXFont to Font except in tex2lyx

[lyx.git] / src / mathed / InsetMathGrid.cpp

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index afcf0cfa48928cbf6f45b1723c4624e9ff559edc..0d6918d1bbdd99b8645a25be07f449fad005ff98 100644 (file)
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -18,7 +18,7 @@
 #include "BufferView.h"
 #include "CutAndPaste.h"
 #include "FuncStatus.h"
-#include "LColor.h"
+#include "Color.h"
 #include "Cursor.h"
 #include "debug.h"
 #include "FuncRequest.h"
@@ -71,7 +71,7 @@ public:
        }
 
 protected:
-       InsetBase & inset() const { return inset_; }
+       Inset & inset() const { return inset_; }
        InsetMathGrid & inset_;
 };
 
@@ -184,9 +184,9 @@ InsetMathGrid::InsetMathGrid(col_type m, row_type n, char v, docstring const & h
 }
 
 
-auto_ptr<InsetBase> InsetMathGrid::doClone() const
+auto_ptr<Inset> InsetMathGrid::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetMathGrid(*this));
+       return auto_ptr<Inset>(new InsetMathGrid(*this));
 }
 
 
@@ -311,13 +311,13 @@ InsetMathGrid::row_type InsetMathGrid::row(idx_type idx) const
 }
 
 
-void InsetMathGrid::vcrskip(LyXLength const & crskip, row_type row)
+void InsetMathGrid::vcrskip(Length const & crskip, row_type row)
 {
        rowinfo_[row].crskip_ = crskip;
 }
 
 
-LyXLength InsetMathGrid::vcrskip(row_type row) const
+Length InsetMathGrid::vcrskip(row_type row) const
 {
        return rowinfo_[row].crskip_;
 }
@@ -492,7 +492,7 @@ void InsetMathGrid::drawWithMargin(PainterInfo & pi, int x, int y,
                                - i * hlinesep() - hlinesep()/2 - rowsep()/2;
                        pi.pain.line(x + lmargin + 1, yy,
                                     x + dim_.width() - rmargin - 1, yy,
-                                    LColor::foreground);
+                                    Color::foreground);
                }
 
        for (col_type col = 0; col <= ncols(); ++col)
@@ -501,7 +501,7 @@ void InsetMathGrid::drawWithMargin(PainterInfo & pi, int x, int y,
                                - i * vlinesep() - vlinesep()/2 - colsep()/2;
                        pi.pain.line(xx, y - dim_.ascent() + 1,
                                     xx, y + dim_.descent() - 1,
-                                    LColor::foreground);
+                                    Color::foreground);
                }
        drawMarkers2(pi, x, y);
 }