* 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 3a93e067dbb16e3b3c079b0efefbda46c0d1f697..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.
 
@@ -45,22 +48,22 @@ public:
        ///
        void read(Buffer const & buf, LyXLex & lex);
        ///
-       virtual lyx::docstring const editMessage() const;
+       virtual docstring const editMessage() const;
        ///
        bool insetAllowed(InsetBase::Code code) const;
        ///
-       int latex(Buffer const &, lyx::odocstream &,
+       int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, lyx::odocstream &,
+       int plaintext(Buffer const &, odocstream &,
                  OutputParams const & runparams) 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;
        ///
@@ -70,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 &);
        ///
@@ -88,8 +91,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetERTMailer : public MailInset {
 public:
        ///
@@ -112,4 +113,7 @@ private:
        InsetERT & inset_;
 };
 
+
+} // namespace lyx
+
 #endif