Minimal fix needed to give Qt a label dialog again.

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index e3fc7d69a6aaf80cb00b84badc41ed56dfdc37f4..e43a5939ad12062df3fe47f6ae79b4965af7b0c0 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -13,10 +13,6 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "LString.h"
 #include "undo.h"
 #include "support/limited_stack.h"
@@ -39,16 +35,6 @@ class ParIterator;
 class ParConstIterator;
 
 
-///
-struct DEPCLEAN {
-       ///
-       bool clean;
-       ///
-       string master;
-       ///
-       DEPCLEAN * next;
-};
-
 /** The buffer object.
   This is the buffer object. It contains all the informations about
   a document loaded into LyX. I am not sure if the class is complete or
@@ -126,7 +112,7 @@ public:
                                        LyXFont &);
        ///
        void insertStringAsLines(Paragraph *&, lyx::pos_type &,
-                                LyXFont const &, string const &) const;
+                                LyXFont const &, string const &);
        ///
        Paragraph * getParFromID(int id) const;
 private:
@@ -164,8 +150,10 @@ public:
        /** LaTeX all paragraphs from par to endpar.
            \param \a endpar if == 0 then to the end
        */
-       void latexParagraphs(std::ostream & os, Paragraph * par,
-                            Paragraph * endpar, TexRow & texrow, bool moving_arg = false) const;
+       void latexParagraphs(std::ostream & os,
+                            ParagraphList::iterator par,
+                            ParagraphList::iterator endpar,
+                            TexRow & texrow, bool moving_arg = false) const;
        ///
        void simpleDocBookOnePar(std::ostream &,
                                 Paragraph * par, int & desc_on,
@@ -261,8 +249,8 @@ public:
        */
        void validate(LaTeXFeatures &) const;
 
-       ///
-       std::vector<std::pair<string, string> > const getBibkeyList() const;
+       /// return all bibkeys from buffer and its childs
+       void fillWithBibKeys(std::vector<std::pair<string, string> > & keys) const;
        ///
        std::vector<string> const getLabelList() const;
 
@@ -308,6 +296,11 @@ public:
        AuthorList & authors();
 
 private:
+       typedef std::map<string, bool> DepClean;
+
+       /// need to regenerate .tex ?
+       DepClean dep_clean_;
+
        /// the author list
        AuthorList authorlist;
 
@@ -320,9 +313,6 @@ private:
        /// is this a unnamed file (New...)
        bool unnamed;
 
-       /// is regenerating #.tex# necessary
-       DEPCLEAN * dep_clean;
-
        /// buffer is r/o
        bool read_only;