Forgot to restore this before committing 18494. This fixes bug 3725.

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

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index c8e3c47c5177c5b03be168900cb1b86f69a5d3af..682e8ffd3983225d7633964ee6a27330fc8c48e4 100644 (file)
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -27,7 +27,7 @@ public:
        ///
        void write(std::ostream & os) const;
        ///
-       void read(LyXLex & lex);
+       void read(Lexer & lex);
        ///
        docstring branch;
 };
@@ -45,11 +45,11 @@ public:
        ///
        virtual docstring const editMessage() const;
        ///
-       InsetBase::Code lyxCode() const { return InsetBase::BRANCH_CODE; }
+       Inset::Code lyxCode() const { return Inset::BRANCH_CODE; }
        ///
        void write(Buffer const &, std::ostream &) const;
        ///
-       void read(Buffer const & buf, LyXLex & lex);
+       void read(Buffer const & buf, Lexer & lex);
        ///
        void setButtonLabel();
        ///
@@ -77,15 +77,19 @@ public:
         */
        bool isBranchSelected(Buffer const & buffer) const;
        ///
-       bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 
 protected:
+       ///
        InsetBranch(InsetBranch const &);
-       virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
+       ///
+       virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+       ///
+       docstring name() const { return from_ascii("Branch"); }
 private:
        friend class InsetBranchParams;
 
-       virtual std::auto_ptr<InsetBase> doClone() const;
+       virtual std::auto_ptr<Inset> doClone() const;
 
        /// used by the constructors
        void init();
@@ -99,7 +103,7 @@ public:
        ///
        InsetBranchMailer(InsetBranch & inset);
        ///
-       virtual InsetBase & inset() const { return inset_; }
+       virtual Inset & inset() const { return inset_; }
        ///
        virtual std::string const & name() const { return name_; }
        ///