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

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

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 162e8950dcaed15744ee0963140e4c91a5b964d7..77f81aef220a049bcaf6f5d780c4770c5c28c2d8 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -13,8 +13,11 @@
 #ifndef INSETERT_H
 #define INSETERT_H
 
-
 #include "insetcollapsable.h"
+#include "mailinset.h"
+
+
+namespace lyx {
 
 /** A collapsable text inset for LaTeX insertions.
 
@@ -31,9 +34,11 @@ class InsetERT : public InsetCollapsable {
 public:
        ///
        InsetERT(BufferParams const &, CollapseStatus status = Open);
+#if 0
        ///
        InsetERT(BufferParams const &,
                 Language const *, std::string const & contents, CollapseStatus status);
+#endif
        ///
        ~InsetERT();
        ///
@@ -41,25 +46,24 @@ public:
        ///
        void write(Buffer const & buf, std::ostream & os) const;
        ///
-       std::string const editMessage() const;
+       void read(Buffer const & buf, LyXLex & lex);
+       ///
+       virtual docstring const editMessage() const;
        ///
        bool insetAllowed(InsetBase::Code code) const;
        ///
-       int latex(Buffer const &, std::ostream &,
+       int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, std::ostream &,
+       int plaintext(Buffer const &, odocstream &,
                  OutputParams const & runparams) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
-       int docbook(Buffer const &, std::ostream &,
+       int docbook(Buffer const &, odocstream &,
                    OutputParams const & runparams) const;
        ///
        void validate(LaTeXFeatures &) const {}
        ///
-       void metrics(MetricsInfo &, Dimension &) const;
+       bool metrics(MetricsInfo &, Dimension &) const;
        ///
        void draw(PainterInfo & pi, int x, int y) const;
        ///
@@ -69,7 +73,7 @@ public:
        ///
        bool forceDefaultParagraphs(idx_type) const { return true; }
        /// should paragraph indendation be ommitted in any case?
-       bool neverIndent() const { return true; }
+       bool neverIndent(Buffer const &) const { return true; }
 protected:
        InsetERT(InsetERT const &);
        ///
@@ -87,8 +91,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetERTMailer : public MailInset {
 public:
        ///
@@ -111,4 +113,7 @@ private:
        InsetERT & inset_;
 };
 
+
+} // namespace lyx
+
 #endif