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

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 3a88423824..034f81158b 100644
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -13,15 +13,28 @@
 #define INSETNOTE_H
 
 #include "insetcollapsable.h"
+#include "mailinset.h"
+
 
+namespace lyx {
 
-struct InsetNoteParams {
+class InsetNoteParams {
+public:
+	enum Type {
+		Note,
+		Comment,
+		Greyedout,
+		Framed,
+		Shaded
+	};
+	/// \c type defaults to Note
+	InsetNoteParams();
 	///
 	void write(std::ostream & os) const;
 	///
 	void read(LyXLex & lex);
 	///
-	std::string type;
+	Type type;
 };
 
 
@@ -32,16 +45,12 @@ class InsetNote : public InsetCollapsable {
 public:
 	///
 	InsetNote(BufferParams const &, std::string const &);
-	/// Copy constructor
-	InsetNote(InsetNote const &);
 	///
 	~InsetNote();
 	///
-	virtual std::auto_ptr<InsetBase> clone() const;
-	///
-	std::string const editMessage() const;
+	virtual docstring const editMessage() const;
 	///
-	InsetOld::Code lyxCode() const { return InsetOld::NOTE_CODE; }
+	InsetBase::Code lyxCode() const { return InsetBase::NOTE_CODE; }
 	///
 	void write(Buffer const &, std::ostream &) const;
 	///
@@ -51,29 +60,26 @@ public:
 	/// show the note dialog
 	bool showInsetDialog(BufferView * bv) const;
 	///
-	int latex(Buffer const &, std::ostream &,
-	       OutputParams const &) const;
-	///
-	int linuxdoc(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;
 	///
 	InsetNoteParams const & params() const { return params_; }
+	///
+	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
 protected:
+	InsetNote(InsetNote const &);
 	///
-	virtual
-	DispatchResult
-	priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 private:
 	friend class InsetNoteParams;
 
+	virtual std::auto_ptr<InsetBase> doClone() const;
+
 	/// used by the constructors
 	void init();
 	///
@@ -81,12 +87,10 @@ private:
 };
 
 
-#include "mailinset.h"
-
 class InsetNoteMailer : public MailInset {
 public:
 	///
-	InsetNoteMailer(std::string const & name, InsetNote & inset);
+	InsetNoteMailer(InsetNote & inset);
 	///
 	virtual InsetBase & inset() const { return inset_; }
 	///
@@ -94,17 +98,18 @@ public:
 	///
 	virtual std::string const inset2string(Buffer const &) const;
 	///
-	static std::string const params2string(std::string const &, InsetNoteParams const &);
+	static std::string const params2string(InsetNoteParams const &);
 	///
 	static void string2params(std::string const &, InsetNoteParams &);
 
 private:
 	///
-	std::string const name_;
+	static std::string const name_;
 	///
 	InsetNote & inset_;
 };
 
 
+} // namespace lyx
 
 #endif