* 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 1bb48f78af49cb896d3ca99a1449876a86b0302a..7992d44d6cdd7d370d08884672e8e38d3ffd5551 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -14,10 +14,14 @@
 #define INSETFLOAT_H
 
 #include "insetcollapsable.h"
-#include "toc.h"
+#include "mailinset.h"
+
+
+namespace lyx {
 
 
-struct InsetFloatParams {
+class InsetFloatParams {
+public:
        ///
        InsetFloatParams() : wide(false), sideways(false) {}
        ///
@@ -51,20 +55,17 @@ public:
        ///
        void validate(LaTeXFeatures & features) const;
        ///
-       InsetOld::Code lyxCode() const { return InsetOld::FLOAT_CODE; }
+       InsetBase::Code lyxCode() const { return InsetBase::FLOAT_CODE; }
        ///
-       int latex(Buffer const &, std::ostream &,
+       int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
-       int docbook(Buffer const &, std::ostream &,
+       int docbook(Buffer const &, odocstream &,
                    OutputParams const &) const;
        ///
-       std::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,11 +75,13 @@ public:
        ///
        void sideways(bool s, BufferParams const &);
        ///
-       void addToToc(lyx::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:
@@ -89,9 +92,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
-
 class InsetFloatMailer : public MailInset {
 public:
        ///
@@ -113,4 +113,7 @@ private:
        InsetFloat & inset_;
 };
 
+
+} // namespace lyx
+
 #endif