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

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

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 555c41f991896df7b2b65da4de62d20d96a1e4ee..034f81158b8766b6c1b86a4e5babe26a08d64e29 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -13,7 +13,10 @@
 #define INSETNOTE_H
 
 #include "insetcollapsable.h"
+#include "mailinset.h"
+
 
+namespace lyx {
 
 class InsetNoteParams {
 public:
@@ -45,7 +48,7 @@ public:
        ///
        ~InsetNote();
        ///
-       std::string const editMessage() const;
+       virtual docstring const editMessage() const;
        ///
        InsetBase::Code lyxCode() const { return InsetBase::NOTE_CODE; }
        ///
@@ -57,14 +60,11 @@ public:
        /// show the note dialog
        bool showInsetDialog(BufferView * bv) const;
        ///
-       int latex(Buffer const &, std::ostream &,
-              OutputParams const &) const;
+       int latex(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int docbook(Buffer const &, std::ostream &,
-              OutputParams const &) const;
+       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
        ///
-       int plaintext(Buffer const &, std::ostream &,
-              OutputParams const &) const;
+       int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
@@ -87,8 +87,6 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetNoteMailer : public MailInset {
 public:
        ///
@@ -111,4 +109,7 @@ private:
        InsetNote & inset_;
 };
 
+
+} // namespace lyx
+
 #endif