changelogs

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

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 98a8b6687d2e79e07566ecfcbabe20049e25d947..5f4a34040ae6c30054c98bdfa3d571cf12b26e37 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -16,12 +16,19 @@
 
 
 struct InsetNoteParams {
+       enum Type {
+               Note,
+               Comment,
+               Greyedout
+       };
+       /// \c type defaults to Note
+       InsetNoteParams();
        ///
        void write(std::ostream & os) const;
        ///
        void read(LyXLex & lex);
        ///
-       std::string type;
+       Type type;
 };
 
 
@@ -31,16 +38,10 @@ struct InsetNoteParams {
 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;
        ///
        InsetOld::Code lyxCode() const { return InsetOld::NOTE_CODE; }
@@ -50,34 +51,33 @@ public:
        void read(Buffer const & buf, LyXLex & lex);
        ///
        void setButtonLabel();
-       ///
-       void metrics(MetricsInfo &, Dimension &) const;
        /// show the note dialog
        bool showInsetDialog(BufferView * bv) const;
        ///
        int latex(Buffer const &, std::ostream &,
-                 OutputParams const &) const;
+              OutputParams const &) const;
        ///
        int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
+              OutputParams const &) const;
        ///
        int docbook(Buffer const &, std::ostream &,
-                   OutputParams const &) const;
+              OutputParams const &) const;
        ///
        int plaintext(Buffer const &, std::ostream &,
-                 OutputParams const &) const;
+              OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
        InsetNoteParams const & params() const { return params_; }
 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();
        ///
@@ -90,7 +90,7 @@ private:
 class InsetNoteMailer : public MailInset {
 public:
        ///
-       InsetNoteMailer(std::string const & name, InsetNote & inset);
+       InsetNoteMailer(InsetNote & inset);
        ///
        virtual InsetBase & inset() const { return inset_; }
        ///
@@ -98,17 +98,15 @@ 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_;
 };
 
-
-
 #endif