dispatchresult -> DispatchResult

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

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 2c7c0473a41f691398bbda07d83a2a13ceae678d..9b21f8c8d7835d32a14fe789f0c6d567ce94ef2d 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -22,7 +22,7 @@
        ///
        void read(LyXLex & lex);
        ///
-       string type;
+       std::string type;
 };
 
 
@@ -34,7 +34,7 @@ public:
        ///
 
 
-       InsetNote(BufferParams const &, string const &);
+       InsetNote(BufferParams const &, std::string const &);
        /// Copy constructor
        InsetNote(InsetNote const &);
        ///
@@ -42,35 +42,37 @@ public:
        ///
        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 &);
-       ///
        void metrics(MetricsInfo &, Dimension &) const;
        /// show the note dialog
        bool showInsetDialog(BufferView * bv) const;
        ///
-       int latex(Buffer const *, std::ostream &,
+       int latex(Buffer const &, std::ostream &,
                        LatexRunParams const &) const;
        ///
-       int linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const &, std::ostream &) const;
        ///
-       int docbook(Buffer const *, std::ostream &, bool) const;
+       int docbook(Buffer const &, std::ostream &, bool) const;
        ///
-       int ascii(Buffer const *, std::ostream &, int) const;
+       int ascii(Buffer const &, std::ostream &, int) const;
        ///
        void validate(LaTeXFeatures &) const;
        ///
        InsetNoteParams const & params() const { return params_; }
-
+protected:
+       ///
+       virtual
+       DispatchResult
+       priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
 private:
        friend class InsetNoteParams;
 
@@ -80,26 +82,27 @@ private:
        InsetNoteParams params_;
 };
 
+
 #include "mailinset.h"
 
 class InsetNoteMailer : public MailInset {
 public:
        ///
-       InsetNoteMailer(string const & name, InsetNote & inset);
+       InsetNoteMailer(std::string const & name, 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(std::string const &, InsetNoteParams const &);
        ///
-       static void string2params(string const &, InsetNoteParams &);
+       static void string2params(std::string const &, InsetNoteParams &);
 
 private:
        ///
-       string const name_;
+       std::string const name_;
        ///
        InsetNote & inset_;
 };