reformatting and remove using delc

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

diff --git a/src/insets/insetbib.h b/src/insets/insetbib.h
index 58266516ab109aa586f678bee68c561fc4fc01e5..6995e60055bfd74aba3dde09f94e544e348530d4 100644 (file)
--- a/src/insets/insetbib.h
+++ b/src/insets/insetbib.h
@@ -20,7 +20,6 @@
 #include "insetcommand.h"
 
 class Buffer;
-struct FD_bibitem_form;
 
 /** Used to insert bibitem's information (key and label)
   
@@ -34,7 +33,7 @@ public:
        ///
        ~InsetBibKey();
        ///
-       Inset * Clone() const;
+       Inset * Clone(Buffer const &) const;
        /** Currently \bibitem is used as a LyX2.x command,
            so we need this method.
        */
@@ -42,7 +41,7 @@ public:
        ///
        void Read(Buffer const *, LyXLex & lex);
        ///
-       virtual string getScreenLabel() const;
+       virtual string const getScreenLabel() const;
         ///
        void Edit(BufferView *, int x, int y, unsigned int button);
        ///
@@ -58,7 +57,7 @@ public:
         ///
         int  getCounter() const { return counter; }
        ///
-       void callback( FD_bibitem_form *, long );
+       string const getBibLabel() const;
        ///
        struct Holder {
                InsetBibKey * inset;
@@ -70,6 +69,8 @@ private:
         int counter;
        ///
        Holder holder;
+       ///
+       static int key_counter;
 };
 
 
@@ -78,13 +79,15 @@ private:
 class InsetBibtex : public InsetCommand {
 public:
        ///
-       InsetBibtex(InsetCommandParams const &, Buffer *);
+       InsetBibtex(InsetCommandParams const &);
        ///
        ~InsetBibtex();
        ///
-       Inset * Clone() const { return new InsetBibtex(params(), owner); }
+       Inset * Clone(Buffer const &) const {
+               return new InsetBibtex(params());
+       }
        ///
-       string getScreenLabel() const;
+       string const getScreenLabel() const;
        ///
        EDITABLE Editable() const { return IS_EDITABLE; }
        ///
@@ -95,7 +98,7 @@ public:
        int Latex(Buffer const *, std::ostream &,
                  bool fragile, bool freespace) const;
        ///
-       std::vector<std::pair<string,string> > getKeys() const;
+       std::vector<std::pair<string,string> > const getKeys(Buffer const *) const;
         ///
         bool addDatabase(string const &);
         ///
@@ -109,9 +112,6 @@ public:
        };
 
 private:
-       ///
-       mutable Buffer * owner;
-
        ///
        Holder holder;
 };