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 3e7b72c81d3b250760e06e0ac9958ab70d291723..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"
@@ -26,29 +22,19 @@
 #include "texrow.h"
 #include "ParagraphList.h"
 #include "paragraph.h"
+#include "author.h"
 
-#include <boost/scoped_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 
 class BufferView;
-class Counters;
 class LyXRC;
 class TeXErrors;
 class LaTeXFeatures;
 class Language;
 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
@@ -110,7 +96,7 @@ public:
            \param par if != 0 insert the file.
            \return \c false if method fails.
        */
-       bool readFile(LyXLex &, Paragraph * par = 0);
+       bool readFile(LyXLex &, string const &, Paragraph * par = 0);
 
        /** Reads a file without header.
            \param par if != 0 insert the file.
@@ -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,
@@ -179,12 +167,6 @@ public:
        ///
        void makeDocBookFile(string const & filename,
                             bool nice, bool only_body = false);
-       /// Open SGML/XML tag.
-       int sgmlOpenTag(std::ostream & os, Paragraph::depth_type depth, bool mixcont,
-               string const & latexname) const;
-       /// Closes SGML/XML tag.
-       int sgmlCloseTag(std::ostream & os, Paragraph::depth_type depth, bool mixcont,
-               string const & latexname) const;
        ///
        void sgmlError(Paragraph * par, int pos, string const & message) const;
 
@@ -267,10 +249,8 @@ public:
        */
        void validate(LaTeXFeatures &) const;
 
-       ///
-       string const getIncludeonlyList(char delim = ',');
-       ///
-       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;
 
@@ -311,10 +291,19 @@ public:
 
        /// Used when typesetting to place errorboxes.
        TexRow texrow;
-       /// Buffer-wide counter array
-       Counters & counters() const;
+
+       /// the author list for the document
+       AuthorList & authors();
 
 private:
+       typedef std::map<string, bool> DepClean;
+
+       /// need to regenerate .tex ?
+       DepClean dep_clean_;
+
+       /// the author list
+       AuthorList authorlist;
+
        /// is save needed
        mutable bool lyx_clean;
 
@@ -324,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;
 
@@ -346,10 +332,6 @@ private:
            of the buffers in the list of users to do a #updateLayoutChoice#.
        */
        BufferView * users;
-
-       /// The pointer is const although its contents may not be
-       boost::scoped_ptr<Counters> const ctrs;
-
 public:
        ///
        class inset_iterator {
@@ -419,7 +401,11 @@ public:
        ///
        ParIterator par_iterator_begin();
        ///
+       ParConstIterator par_iterator_begin() const;
+       ///
        ParIterator par_iterator_end();
+       ///
+       ParConstIterator par_iterator_end() const;
 
        ///
        Inset * getInsetFromID(int id_arg) const;