X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetnote.h;h=5f4a34040ae6c30054c98bdfa3d571cf12b26e37;hb=10ba1b8918e7da14334bb5573ce2a707671c8b51;hp=cbf7878e7f4f3cc32488917a1b50483e8b1b0cc0;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index cbf7878e7f..5f4a34040a 100644
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -12,17 +12,23 @@
 #ifndef INSETNOTE_H
 #define INSETNOTE_H
 
-
 #include "insetcollapsable.h"
 
 
- struct InsetNoteParams {
+struct InsetNoteParams {
+	enum Type {
+		Note,
+		Comment,
+		Greyedout
+	};
+	/// \c type defaults to Note
+	InsetNoteParams();
 	///
 	void write(std::ostream & os) const;
 	///
 	void read(LyXLex & lex);
 	///
-	string type;
+	Type type;
 };
 
 
@@ -32,76 +38,75 @@
 class InsetNote : public InsetCollapsable {
 public:
 	///
-
-
-	InsetNote(BufferParams const &, string const &);
-	/// Copy constructor
-	InsetNote(InsetNote const &);
+	InsetNote(BufferParams const &, std::string const &);
 	///
 	~InsetNote();
 	///
-	virtual std::auto_ptr<InsetBase> clone() const;
-	///
-	string const editMessage() const;
+	std::string const editMessage() const;
 	///
 	InsetOld::Code lyxCode() const { return InsetOld::NOTE_CODE; }
 	///
-	void write(Buffer const *, std::ostream &) const;
+	void write(Buffer const &, std::ostream &) const;
 	///
-	void read(Buffer const * buf, LyXLex & lex);
+	void read(Buffer const & buf, LyXLex & lex);
 	///
 	void setButtonLabel();
-	///
-	dispatch_result InsetNote::localDispatch(FuncRequest const &);
 	/// show the note dialog
 	bool showInsetDialog(BufferView * bv) const;
 	///
-	int latex(Buffer const *, std::ostream &,
-			LatexRunParams const &) const;
+	int latex(Buffer const &, std::ostream &,
+	       OutputParams const &) const;
 	///
-	int linuxdoc(Buffer const *, std::ostream &) const;
+	int linuxdoc(Buffer const &, std::ostream &,
+	       OutputParams const &) const;
 	///
-	int docbook(Buffer const *, std::ostream &, bool) const;
+	int docbook(Buffer const &, std::ostream &,
+	       OutputParams const &) const;
 	///
-	int ascii(Buffer const *, std::ostream &, int) const;
+	int plaintext(Buffer const &, std::ostream &,
+	       OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures &) const;
 	///
 	InsetNoteParams const & params() const { return params_; }
-
+protected:
+	InsetNote(InsetNote const &);
+	///
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 private:
 	friend class InsetNoteParams;
 
+	virtual std::auto_ptr<InsetBase> doClone() const;
+
 	/// used by the constructors
 	void init();
 	///
 	InsetNoteParams params_;
 };
 
+
 #include "mailinset.h"
 
 class InsetNoteMailer : public MailInset {
 public:
 	///
-	InsetNoteMailer(string const & name, InsetNote & inset);
+	InsetNoteMailer(InsetNote & inset);
 	///
 	virtual InsetBase & inset() const { return inset_; }
 	///
-	virtual string const & name() const { return name_; }
+	virtual std::string const & name() const { return name_; }
 	///
-	virtual string const inset2string(Buffer const &) const;
+	virtual std::string const inset2string(Buffer const &) const;
 	///
-	static string const params2string(string const &, InsetNoteParams const &);
+	static std::string const params2string(InsetNoteParams const &);
 	///
-	static void string2params(string const &, InsetNoteParams &);
+	static void string2params(std::string const &, InsetNoteParams &);
 
 private:
 	///
-	string const name_;
+	static std::string const name_;
 	///
 	InsetNote & inset_;
 };
 
-
-
 #endif