X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetnote.h;h=034f81158b8766b6c1b86a4e5babe26a08d64e29;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=02e7ba0afb5d4987fdb0dff95b7b9314f961ee4e;hpb=edd81011cecb115b1dc05cc68bf5206fa0e853dd;p=lyx.git

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 02e7ba0afb..034f81158b 100644
--- 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();
 	///
-	virtual lyx::docstring 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