X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFootlike.cpp;h=2f6b8f5b6d6556b51bb7366d019f163cfec24582;hb=b81c90adeef28a836d9786671849401b747e350b;hp=a34b3f1e8868ba0181684166c8bf2a384a852a5f;hpb=00e305c9d9bd8b0ff54b6c58adb6192d5934ed60;p=lyx.git

diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index a34b3f1e88..2f6b8f5b6d 100644
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -15,9 +15,7 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
-#include "LColor.h"
 #include "MetricsInfo.h"
-#include "Paragraph.h"
 
 
 namespace lyx {
@@ -25,10 +23,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 +34,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 +56,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 +65,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);
 }