Fix trailing whitespace in cpp files.

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

diff --git a/src/insets/InsetFootlike.cpp b/src/insets/InsetFootlike.cpp
index 7c9fcb204c450c3eb270cbf331666c5655796753..5685e865bfa8407ed6b6eec42966e3b9b0924127 100644 (file)
--- a/src/insets/InsetFootlike.cpp
+++ b/src/insets/InsetFootlike.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,67 +15,53 @@
 #include "Buffer.h"
 #include "BufferView.h"
 #include "BufferParams.h"
-#include "Color.h"
+#include "Font.h"
 #include "MetricsInfo.h"
-#include "Paragraph.h"
 
+#include "support/lstrings.h"
 
-namespace lyx {
+#include <iostream>
 
-InsetFootlike::InsetFootlike(BufferParams const & bp)
-       : InsetCollapsable(bp)
-{
-       LyXFont font(LyXFont::ALL_SANE);
-       font.decSize();
-       font.decSize();
-       font.setColor(Color::collapsable);
-       setLabelFont(font);
-}
+using namespace std;
 
+namespace lyx {
 
-InsetFootlike::InsetFootlike(InsetFootlike const & in)
-       : InsetCollapsable(in)
-{
-       LyXFont font(LyXFont::ALL_SANE);
-       font.decSize();
-       font.decSize();
-       font.setColor(Color::collapsable);
-       setLabelFont(font);
-}
+using support::token;
+
+InsetFootlike::InsetFootlike(Buffer * buf)
+       : InsetCollapsable(buf)
+{}
 
 
-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(ostream & os) const
 {
-       os << to_utf8(insetName()) << "\n";
-       InsetCollapsable::write(buf, os);
+       // The layoutName may contain a "InTitle" qualifier
+       os << to_utf8(token(layoutName(), char_type(':'), 0)) << "\n";
+       InsetCollapsable::write(os);
 }
 
 
-bool InsetFootlike::insetAllowed(Inset::Code code) const
+bool InsetFootlike::insetAllowed(InsetCode code) const
 {
-       if (code == Inset::FOOT_CODE || code == Inset::MARGIN_CODE
-           || code == Inset::FLOAT_CODE)
+       if (code == FOOT_CODE || code == MARGIN_CODE || code == FLOAT_CODE)
                return false;
        return InsetCollapsable::insetAllowed(code);
 }