Final touch 'inset display()'; fix 'is a bit silly' bug

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

diff --git a/src/insets/insetbibtex.h b/src/insets/insetbibtex.h
index 4d0ca5e4e187a680b7f4a76496526030e8fff255..a7fddf505d24c377d2333113faeaf960cfdc3813 100644 (file)
--- a/src/insets/insetbibtex.h
+++ b/src/insets/insetbibtex.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_BIBTEX_H
@@ -16,8 +16,6 @@
 #include <vector>
 #include "insetcommand.h"
 
-//class Buffer;
-
 /** Used to insert BibTeX's information
   */
 class InsetBibtex : public InsetCommand {
@@ -27,40 +25,34 @@ public:
        ///
        ~InsetBibtex();
        ///
-       std::auto_ptr<InsetBase> clone() const {
-               return std::auto_ptr<InsetBase>(new InsetBibtex(params()));
-       }
-       /// small wrapper for the time being
-       virtual dispatch_result localDispatch(FuncRequest const & cmd);
+       std::auto_ptr<InsetBase> clone() const;
+       ///
+       void metrics(MetricsInfo &, Dimension &) const;
+       ///
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       string const getScreenLabel(Buffer const *) const;
+       std::string const getScreenLabel(Buffer const &) const;
        ///
        EDITABLE editable() const { return IS_EDITABLE; }
        ///
        InsetOld::Code lyxCode() const { return InsetOld::BIBTEX_CODE; }
        ///
-       int latex(Buffer const *, std::ostream &,
+       int latex(Buffer const &, std::ostream &,
                  LatexRunParams const &) const;
        ///
-       void fillWithBibKeys(Buffer const * buffer,
-               std::vector<std::pair<string,string> > & keys) const;
+       void fillWithBibKeys(Buffer const & buffer,
+               std::vector<std::pair<std::string,std::string> > & keys) const;
        ///
-       std::vector<string> const getFiles(Buffer const &) const;
+       std::vector<std::string> const getFiles(Buffer const &) const;
        ///
-       bool addDatabase(string const &);
+       bool addDatabase(std::string const &);
        ///
-       bool delDatabase(string const &);
-       ///
-       bool display() const { return true; }
-       ///
-       struct Holder {
-               InsetBibtex * inset;
-               BufferView * view;
-       };
-
-private:
+       bool delDatabase(std::string const &);
+protected:
        ///
-       Holder holder;
+       virtual
+       dispatch_result
+       priv_dispatch(FuncRequest const & cmd, idx_type &, pos_type &);
 };
 
 #endif // INSET_BIBTEX_H