Remove color dependency of framed note, fix bug 3598

[lyx.git] / src / insets / InsetFootlike.cpp

diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index a34b3f1e8868ba0181684166c8bf2a384a852a5f..0caa4f2c3ff206421052c970071caff8283b05c7 100644 (file)
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -15,7 +15,7 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
-#include "LColor.h"
+#include "Color.h"
 #include "MetricsInfo.h"
 #include "Paragraph.h"
 
@@ -25,10 +25,10 @@ namespace lyx {
 InsetFootlike::InsetFootlike(BufferParams const & bp)
        : InsetCollapsable(bp)
 {
-       LyXFont font(LyXFont::ALL_SANE);
+       Font font(Font::ALL_SANE);
        font.decSize();
        font.decSize();
-       font.setColor(LColor::collapsable);
+       font.setColor(Color::collapsable);
        setLabelFont(font);
 }
 
@@ -36,17 +36,17 @@ InsetFootlike::InsetFootlike(BufferParams const & bp)
 InsetFootlike::InsetFootlike(InsetFootlike const & in)
        : InsetCollapsable(in)
 {
-       LyXFont font(LyXFont::ALL_SANE);
+       Font font(Font::ALL_SANE);
        font.decSize();
        font.decSize();
-       font.setColor(LColor::collapsable);
+       font.setColor(Color::collapsable);
        setLabelFont(font);
 }
 
 
 bool InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       LyXFont tmpfont = mi.base.font;
+       Font tmpfont = mi.base.font;
        mi.base.font = mi.base.bv->buffer()->params().getFont();
        InsetCollapsable::metrics(mi, dim);
        mi.base.font = tmpfont;
@@ -58,7 +58,7 @@ bool InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetFootlike::draw(PainterInfo & pi, int x, int y) const
 {
-       LyXFont tmpfont = pi.base.font;
+       Font tmpfont = pi.base.font;
        pi.base.font = pi.base.bv->buffer()->params().getFont();
        InsetCollapsable::draw(pi, x, y);
        pi.base.font = tmpfont;
@@ -67,15 +67,15 @@ void InsetFootlike::draw(PainterInfo & pi, int x, int y) const
 
 void InsetFootlike::write(Buffer const & buf, std::ostream & os) const
 {
-       os << to_utf8(getInsetName()) << "\n";
+       os << to_utf8(name()) << "\n";
        InsetCollapsable::write(buf, os);
 }
 
 
-bool InsetFootlike::insetAllowed(InsetBase::Code code) const
+bool InsetFootlike::insetAllowed(Inset::Code code) const
 {
-       if (code == InsetBase::FOOT_CODE || code == InsetBase::MARGIN_CODE
-           || code == InsetBase::FLOAT_CODE)
+       if (code == Inset::FOOT_CODE || code == Inset::MARGIN_CODE
+           || code == Inset::FLOAT_CODE)
                return false;
        return InsetCollapsable::insetAllowed(code);
 }