Some more changes for updating text-insets.

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

diff --git a/src/insets/insetbib.h b/src/insets/insetbib.h
index 05255d03c20cd0d27e00ca973b94fbb0627b1291..1c3adc371e56531f00ff575dd49529d469a64d2d 100644 (file)
--- a/src/insets/insetbib.h
+++ b/src/insets/insetbib.h
@@ -17,44 +17,10 @@
 #endif
 
 #include "insetcommand.h"
+#include <vector>
 
 class Buffer;
 
-/** Used to insert citations  
- */
-class InsetCitation: public InsetCommand {
-public:
-       ///
-       InsetCitation() : InsetCommand("cite") {}
-       ///
-       explicit
-       InsetCitation(string const & key, string const & note = string());
-        ///
-       ~InsetCitation();
-        ///
-        Inset * Clone() const {
-               return new InsetCitation(contents, options);
-       }
-       ///
-       string getScreenLabel()const;
-        ///
-       void Edit(BufferView *, int x, int y, unsigned int button);
-        ///
-       EDITABLE Editable() const {
-               return IS_EDITABLE;
-       }
-       ///
-       struct Holder {
-               InsetCitation * inset;
-               BufferView * view;
-       };
-
-private:
-       ///
-       Holder holder;
-};
-
-
 /** Used to insert bibitem's information (key and label)
   
   Must be automatically inserted as the first object in a
@@ -75,7 +41,7 @@ public:
        ///
         Inset * Clone() const { return new InsetBibKey(this); }
        /// Currently \bibitem is used as a LyX2.x command, so we need this method.
-        void Write(std::ostream &) const;
+        void Write(Buffer const *, std::ostream &) const;
        ///
        virtual string getScreenLabel() const;
         ///
@@ -97,7 +63,7 @@ public:
                InsetBibKey * inset;
                BufferView * view;
        };
-
+ 
  private:
        ///
         int counter;
@@ -121,7 +87,7 @@ public:
 
         ///
        Inset * Clone() const {
-               return new InsetBibtex(contents, options, 0);
+               return new InsetBibtex(getCmdName(), getOptions(), 0);
        }
        ///  
        Inset::Code LyxCode() const
@@ -133,9 +99,9 @@ public:
        ///
        void Edit(BufferView *, int x, int y, unsigned int button);
        /// 
-       int Latex(std::ostream &, signed char, bool) const;
+       int Latex(Buffer const *, std::ostream &, bool fragile, bool freespace) const;
        ///
-       string getKeys(char delim);
+       std::vector< std::pair<string,string> > getKeys() const;
        ///
        EDITABLE Editable() const {
                return IS_EDITABLE;