ws changes only

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

diff --git a/src/insets/insetminipage.h b/src/insets/insetminipage.h
index f5f5cafada146ec801f0cbd828eade891782d55c..e484b3bf441a05f24354fc4cce7c89f741d6dca2 100644 (file)
--- a/src/insets/insetminipage.h
+++ b/src/insets/insetminipage.h
@@ -7,12 +7,11 @@
  * \author Jürgen Vigna
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
-#ifndef InsetMinipage_H
-#define InsetMinipage_H
-
+#ifndef INSETMINIPAGE_H
+#define INSETMINIPAGE_H
 
 #include "insetcollapsable.h"
 #include "lyxlength.h"
@@ -57,49 +56,28 @@ public:
        ///
        InsetMinipage(BufferParams const &);
        ///
-       InsetMinipage(InsetMinipage const &, bool same_id = false);
+       InsetMinipage(InsetMinipage const &);
        ///
        ~InsetMinipage();
        ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd); 
-       ///
-       void write(Buffer const * buf, std::ostream & os) const;
-       ///
-       void read(Buffer const * buf, LyXLex & lex);
-       ///
-       Inset * clone(Buffer const &, bool same_id = false) const;
-       ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
-       ///
-       Inset::Code lyxCode() const { return Inset::MINIPAGE_CODE; }
-       ///
-       int latex(Buffer const *, std::ostream &, bool fragile, bool fp) const;
-       ///
-       string const editMessage() const;
-       ///
-       bool insetAllowed(Inset::Code) const;
-       ///
-       Position pos() const;
-       ///
-       void pos(Position);
+       virtual dispatch_result localDispatch(FuncRequest const & cmd);
        ///
-       InnerPosition innerPos() const;
+       void write(Buffer const & buf, std::ostream & os) const;
        ///
-       void innerPos(InnerPosition);
+       void read(Buffer const & buf, LyXLex & lex);
        ///
-       LyXLength const & pageHeight() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       void pageHeight(LyXLength const &);
+       void metrics(MetricsInfo &, Dimension &) const;
        ///
-       LyXLength const & pageWidth() const;
+       InsetOld::Code lyxCode() const { return InsetOld::MINIPAGE_CODE; }
        ///
-       void pageWidth(LyXLength const &);
+       int latex(Buffer const &, std::ostream &,
+                 LatexRunParams const &) const;
        ///
-       int getMaxWidth(BufferView *, UpdatableInset const *) const;
+       std::string const editMessage() const;
        ///
-       bool needFullRow() const { return false; }
+       bool insetAllowed(InsetOld::Code) const;
        /** returns true if, when outputing LaTeX, font changes should
            be closed before generating this inset. This is needed for
            insets that may contain several paragraphs */
@@ -126,18 +104,18 @@ public:
        ///
        InsetMinipageMailer(InsetMinipage & inset);
        ///
-       virtual Inset & inset() const { return inset_; }
+       virtual InsetBase & inset() const { return inset_; }
        ///
-       virtual string const & name() const { return name_; }
+       virtual std::string const & name() const { return name_; }
        ///
-       virtual string const inset2string() const;
+       virtual std::string const inset2string(Buffer const &) const;
        ///
-       static void string2params(string const &, InsetMinipage::Params &);
+       static void string2params(std::string const &, InsetMinipage::Params &);
        ///
-       static string const params2string(InsetMinipage::Params const &);
+       static std::string const params2string(InsetMinipage::Params const &);
 private:
        ///
-       static string const name_;
+       static std::string const name_;
        ///
        InsetMinipage & inset_;
 };