Merge branch 'master' into biblatex2

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

diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index 416dffbf31c17688fffc038958df41e399acc021..f92304aa397625f8c7db100ff862e28ee50a0f5a 100644 (file)
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -38,17 +38,18 @@ public:
        ///
        static std::string params2string(CollapseStatus);
 
-       docstring contextMenuName() const
-               { return from_ascii("context-ert"); }
+       std::string contextMenuName() const
+               { return "context-ert"; }
 private:
        ///
        InsetCode lyxCode() const { return ERT_CODE; }
        ///
-       docstring name() const { return from_ascii("ERT"); }
+       docstring layoutName() const { return from_ascii("ERT"); }
        ///
        void write(std::ostream & os) const;
        ///
-       int plaintext(odocstream &, OutputParams const &) const;
+       int plaintext(odocstringstream & ods, OutputParams const & op,
+                     size_t max_length = INT_MAX) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///