* 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 e1000de62908164ab14c17f6437f77bfb84e73de..7992d44d6cdd7d370d08884672e8e38d3ffd5551 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -14,22 +14,28 @@
 #define INSETFLOAT_H
 
 #include "insetcollapsable.h"
-#include "toc.h"
+#include "mailinset.h"
+
+
+namespace lyx {
 
 
-struct InsetFloatParams {
+class InsetFloatParams {
+public:
        ///
-       InsetFloatParams() : 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;
 };
 
 
@@ -39,34 +45,27 @@ struct InsetFloatParams {
 class InsetFloat : public InsetCollapsable {
 public:
        ///
-       InsetFloat(BufferParams const &, string const &);
-       ///
-       InsetFloat(InsetFloat const &);
+       InsetFloat(BufferParams const &, std::string const &);
        ///
        ~InsetFloat();
        ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd);
-       ///
        void write(Buffer const & buf, std::ostream & os) const;
        ///
        void read(Buffer const & buf, LyXLex & lex);
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       virtual std::auto_ptr<InsetBase> clone() const;
-       ///
-       InsetOld::Code lyxCode() const { return InsetOld::FLOAT_CODE; }
-       ///
-       int latex(Buffer const &, std::ostream &,
-                 LatexRunParams const &) const;
+       InsetBase::Code lyxCode() const { return InsetBase::FLOAT_CODE; }
        ///
-       int linuxdoc(Buffer const &, std::ostream &) const;
+       int latex(Buffer const &, odocstream &,
+                 OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &, bool mixcont) const;
+       int docbook(Buffer const &, odocstream &,
+                   OutputParams const &) const;
        ///
-       string const editMessage() const;
+       virtual docstring const editMessage() const;
        ///
-       bool insetAllowed(InsetOld::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 */
@@ -74,21 +73,25 @@ public:
        ///
        void wide(bool w, BufferParams const &);
        ///
-       void addToToc(lyx::toc::TocList &, Buffer const &) const;
+       void sideways(bool s, BufferParams 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:
        ///
@@ -96,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(Buffer const &) 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