* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

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

diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index cee68959a2c1403dd0bbbfdd788a9656ef0d118b..7992d44d6cdd7d370d08884672e8e38d3ffd5551 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -7,30 +7,35 @@
  * \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 InsetFloat_H
-#define InsetFloat_H
-
+#ifndef INSETFLOAT_H
+#define INSETFLOAT_H
 
 #include "insetcollapsable.h"
-#include "toc.h"
+#include "mailinset.h"
+
 
+namespace lyx {
 
-struct InsetFloatParams {
+
+class InsetFloatParams {
+public:
        ///
-       InsetFloatParams() : placement("htbp"), wide(false) {}
+       InsetFloatParams() : wide(false), sideways(false) {}
        ///
        void write(std::ostream & os) const;
        ///
        void read(LyXLex & lex);
        ///
-       string type;
+       std::string type;
        ///
-       string placement;
+       std::string placement;
        ///
        bool wide;
+       ///
+       bool sideways;
 };
 
 
@@ -40,61 +45,53 @@ struct InsetFloatParams {
 class InsetFloat : public InsetCollapsable {
 public:
        ///
-       InsetFloat(BufferParams const &, string const &);
-       ///
-       InsetFloat(InsetFloat const &, bool same_id = false);
+       InsetFloat(BufferParams const &, std::string const &);
        ///
        ~InsetFloat();
        ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd); 
-       ///
-       void write(Buffer const * buf, std::ostream & os) const;
+       void write(Buffer const & buf, std::ostream & os) const;
        ///
-       void read(Buffer const * buf, LyXLex & lex);
+       void read(Buffer const & buf, LyXLex & lex);
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       Inset * clone(Buffer const &, bool same_id = false) const;
+       InsetBase::Code lyxCode() const { return InsetBase::FLOAT_CODE; }
        ///
-       Inset::Code lyxCode() const { return Inset::FLOAT_CODE; }
+       int latex(Buffer const &, odocstream &,
+                 OutputParams const &) const;
        ///
-       int latex(Buffer const *, std::ostream &, bool fragile, bool fp) const;
+       int docbook(Buffer const &, odocstream &,
+                   OutputParams const &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+       virtual docstring const editMessage() const;
        ///
-       string const editMessage() const;
-       ///
-       bool insetAllowed(Inset::Code) const;
+       bool insetAllowed(InsetBase::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 */
        bool noFontChange() const { return true; }
        ///
-       string const & type() const;
-       ///
-       void placement(string const & p);
-       ///
-       string const & placement() const;
-       ///
        void wide(bool w, BufferParams const &);
        ///
-       bool wide() const;
+       void sideways(bool s, BufferParams const &);
        ///
-       void addToToc(toc::TocList &, Buffer const *) const;
+       void addToToc(TocList &, Buffer const &) const;
        ///
        bool  showInsetDialog(BufferView *) const;
        ///
        InsetFloatParams const & params() const { return params_; }
-       
+       ///
+       bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+protected:
+       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 private:
+       virtual std::auto_ptr<InsetBase> doClone() const;
+
        ///
        InsetFloatParams params_;
 };
 
 
-#include "mailinset.h"
-
-
 class InsetFloatMailer : public MailInset {
 public:
        ///
@@ -102,18 +99,21 @@ public:
        ///
        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 &, InsetFloatParams &);
+       static void string2params(std::string const &, InsetFloatParams &);
        ///
-       static string const params2string(InsetFloatParams const &);
+       static std::string const params2string(InsetFloatParams const &);
 private:
        ///
-       static string const name_;
+       static std::string const name_;
        ///
        InsetFloat & inset_;
 };
 
+
+} // namespace lyx
+
 #endif