X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFootlike.cpp;h=9d0b69040394c299aa2c37399d9284f2a40138ed;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=954081b57160985a4f64a27f55af0361f396c281;hpb=c8d00ed1272cd489041bed2115081008b6a26489;p=lyx.git

diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index 954081b571..9d0b690403 100644
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -12,70 +12,56 @@
 
 #include "InsetFootlike.h"
 
-#include "buffer.h"
+#include "Buffer.h"
 #include "BufferView.h"
-#include "bufferparams.h"
-#include "LColor.h"
-#include "metricsinfo.h"
-#include "paragraph.h"
+#include "BufferParams.h"
+#include "MetricsInfo.h"
 
+#include <iostream>
+
+using namespace std;
 
 namespace lyx {
 
+
 InsetFootlike::InsetFootlike(BufferParams const & bp)
 	: InsetCollapsable(bp)
-{
-	LyXFont font(LyXFont::ALL_SANE);
-	font.decSize();
-	font.decSize();
-	font.setColor(LColor::collapsable);
-	setLabelFont(font);
-}
+{}
 
 
 InsetFootlike::InsetFootlike(InsetFootlike const & in)
 	: InsetCollapsable(in)
-{
-	LyXFont font(LyXFont::ALL_SANE);
-	font.decSize();
-	font.decSize();
-	font.setColor(LColor::collapsable);
-	setLabelFont(font);
-}
+{}
 
 
-bool InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetFootlike::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	LyXFont tmpfont = mi.base.font;
-	mi.base.font = mi.base.bv->buffer()->params().getFont();
+	FontInfo tmpfont = mi.base.font;
+	mi.base.font = mi.base.bv->buffer().params().getFont().fontInfo();
 	InsetCollapsable::metrics(mi, dim);
 	mi.base.font = tmpfont;
-	bool const changed = dim_ != dim;
-	dim_ = dim;
-	return changed;
 }
 
 
 void InsetFootlike::draw(PainterInfo & pi, int x, int y) const
 {
-	LyXFont tmpfont = pi.base.font;
-	pi.base.font = pi.base.bv->buffer()->params().getFont();
+	FontInfo tmpfont = pi.base.font;
+	pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo();
 	InsetCollapsable::draw(pi, x, y);
 	pi.base.font = tmpfont;
 }
 
 
-void InsetFootlike::write(Buffer const & buf, std::ostream & os) const
+void InsetFootlike::write(Buffer const & buf, 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(InsetCode code) const
 {
-	if (code == InsetBase::FOOT_CODE || code == InsetBase::MARGIN_CODE
-	    || code == InsetBase::FLOAT_CODE)
+	if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE)
 		return false;
 	return InsetCollapsable::insetAllowed(code);
 }