Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetFootlike.h b/src/insets/InsetFootlike.h
index 1a30aff2db2600fb1cc05bec36eac2a5c39f7c11..f16f355a963b09d44adee31689717c95065892c3 100644 (file)
--- a/src/insets/InsetFootlike.h
+++ b/src/insets/InsetFootlike.h
@@ -4,7 +4,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.
  */
@@ -23,21 +23,22 @@ namespace lyx {
 class InsetFootlike : public InsetCollapsable {
 public:
        ///
-       InsetFootlike(BufferParams const &);
+       InsetFootlike(Buffer *);
        ///
-       InsetFootlike(InsetFootlike const &);
+       bool hasSettings() const { return false; }
+private:
        ///
-       bool metrics(MetricsInfo &, Dimension &) const;
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
-       void write(Buffer const & buf, std::ostream & os) const;
+       void write(std::ostream & os) const;
        ///
-       bool insetAllowed(Inset::Code) const;
-       /** returns true if, when outputing LaTeX, font changes should
+       bool insetAllowed(InsetCode) const;
+       /** returns false if, when outputing LaTeX, font changes should
            be closed before generating this inset. This is needed for
            insets that may contain several paragraphs */
-       bool noFontChange() const { return true; }
+       bool inheritFont() const { return false; }
 };