the dispatch patch

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

diff --git a/src/insets/insetbibitem.h b/src/insets/insetbibitem.h
index be080cf6e89067be21d48003efc2dc4c01c58d97..ae3c6649a315ace94a2f2b33fe8906453bc26d38 100644 (file)
--- a/src/insets/insetbibitem.h
+++ b/src/insets/insetbibitem.h
@@ -6,7 +6,7 @@
  *
  * \author Alejandro Aguilar Sierra
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef INSET_BIBITEM_H
@@ -30,20 +30,18 @@ public:
        ~InsetBibitem();
        ///
        std::auto_ptr<InsetBase> clone() const;
-       ///
-       virtual dispatch_result localDispatch(FuncRequest const & cmd);
        /** Currently \bibitem is used as a LyX2.x command,
            so we need this method.
        */
-       void write(Buffer const *, std::ostream &) const;
+       void write(Buffer const &, std::ostream &) const;
        ///
-       void read(Buffer const *, LyXLex & lex);
+       void read(Buffer const &, LyXLex & lex);
        ///
-       virtual string const getScreenLabel(Buffer const *) const;
+       virtual std::string const getScreenLabel(Buffer const &) const;
        ///
        EDITABLE editable() const { return IS_EDITABLE; }
        ///
-       Inset::Code lyxCode() const { return Inset::BIBITEM_CODE; }
+       InsetOld::Code lyxCode() const { return InsetOld::BIBITEM_CODE; }
        /// keep .lyx format compatible
        bool directWrite() const { return true; }
        ///
@@ -51,19 +49,16 @@ public:
        ///
        int getCounter() const { return counter; }
        ///
-       string const getBibLabel() const;
+       std::string const getBibLabel() const;
+protected:
        ///
-       struct Holder {
-               InsetBibitem * inset;
-               BufferView * view;
-       };
-
+       virtual
+       dispatch_result
+       priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &);
 private:
        ///
        int counter;
        ///
-       Holder holder;
-       ///
        static int key_counter;
 };