* 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 2782a64d52b871209b5fb239f3178988f042d0c1..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,39 +34,36 @@ class InsetERT : public InsetCollapsable {
 public:
        ///
        InsetERT(BufferParams const &, CollapseStatus status = Open);
-       ///
-       InsetERT(InsetERT const &);
-       ///
-       virtual std::auto_ptr<InsetBase> clone() const;
+#if 0
        ///
        InsetERT(BufferParams const &,
                 Language const *, std::string const & contents, CollapseStatus status);
+#endif
        ///
        ~InsetERT();
        ///
-       InsetOld::Code lyxCode() const { return InsetOld::ERT_CODE; }
+       InsetBase::Code lyxCode() const { return InsetBase::ERT_CODE; }
        ///
        void write(Buffer const & buf, std::ostream & os) const;
        ///
-       std::string const editMessage() const;
+       void read(Buffer const & buf, LyXLex & lex);
        ///
-       bool insetAllowed(InsetOld::Code code) const;
+       virtual docstring const editMessage() const;
        ///
-       int latex(Buffer const &, std::ostream &,
+       bool insetAllowed(InsetBase::Code code) const;
+       ///
+       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;
        ///
@@ -71,13 +71,17 @@ public:
        ///
        void getDrawFont(LyXFont &) const;
        ///
-       bool forceDefaultParagraphs(InsetOld const *) const { return true; }
+       bool forceDefaultParagraphs(idx_type) const { return true; }
+       /// should paragraph indendation be ommitted in any case?
+       bool neverIndent(Buffer const &) const { return true; }
 protected:
+       InsetERT(InsetERT const &);
+       ///
+       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
        ///
-       virtual
-       DispatchResult
-       priv_dispatch(LCursor & cur, FuncRequest const & cmd);
+       bool getStatus(LCursor & cur, FuncRequest const & cmd, FuncStatus &) const;
 private:
+       virtual std::auto_ptr<InsetBase> doClone() const;
        ///
        void init();
        ///
@@ -87,8 +91,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetERTMailer : public MailInset {
 public:
        ///
@@ -111,4 +113,7 @@ private:
        InsetERT & inset_;
 };
 
+
+} // namespace lyx
+
 #endif