]> git.lyx.org Git - lyx.git/blobdiff - src/buffer.h
remove broken xpm
[lyx.git] / src / buffer.h
index f380c62403db89e28993395266e9ec51dde932b1..3e7b72c81d3b250760e06e0ac9958ab70d291723 100644 (file)
 #include "lyxvc.h"
 #include "bufferparams.h"
 #include "texrow.h"
+#include "ParagraphList.h"
 #include "paragraph.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;
 
-#define NO_COMPABILITY 1
 
 ///
 struct DEPCLEAN {
@@ -125,13 +127,6 @@ public:
        ///
        void insertStringAsLines(Paragraph *&, lyx::pos_type &,
                                 LyXFont const &, string const &) const;
-#ifndef NO_COMPABILITY
-       ///
-       Inset * isErtInset(Paragraph * par, int pos) const;
-       ///
-       void insertErtContents(Paragraph * par, int & pos,
-                              bool set_inactive = true);
-#endif
        ///
        Paragraph * getParFromID(int id) const;
 private:
@@ -152,7 +147,7 @@ public:
        ///
        void writeFileAscii(std::ostream &, int);
        ///
-       string const asciiParagraph(Paragraph const *, unsigned int linelen,
+       string const asciiParagraph(Paragraph const &, unsigned int linelen,
                                    bool noparbreak = false) const;
        /// Just a wrapper for the method below, first creating the ofstream.
        void makeLaTeXFile(string const & filename,
@@ -277,7 +272,7 @@ public:
        ///
        std::vector<std::pair<string, string> > const getBibkeyList() const;
        ///
-       std::vector<string> const getLabelList();
+       std::vector<string> const getLabelList() const;
 
        /** This will clearly have to change later. Later we can have more
            than one user per buffer. */
@@ -301,7 +296,7 @@ public:
            This is a linked list of paragraph, this list holds the
            whole contents of the document.
         */
-       Paragraph * paragraph;
+       ParagraphList paragraphs;
 
        /// LyX version control object.
        LyXVC lyxvc;
@@ -316,6 +311,9 @@ public:
 
        /// Used when typesetting to place errorboxes.
        TexRow texrow;
+       /// Buffer-wide counter array
+       Counters & counters() const;
+
 private:
        /// is save needed
        mutable bool lyx_clean;
@@ -349,6 +347,9 @@ private:
        */
        BufferView * users;
 
+       /// The pointer is const although its contents may not be
+       boost::scoped_ptr<Counters> const ctrs;
+
 public:
        ///
        class inset_iterator {
@@ -358,47 +359,28 @@ public:
                typedef ptrdiff_t difference_type;
                typedef Inset * pointer;
                typedef Inset & reference;
+               typedef ParagraphList::iterator base_type;
 
-
-               ///
-               inset_iterator() : par(0) /*, it(0)*/ {}
-               //
-               inset_iterator(Paragraph * paragraph) : par(paragraph) {
-                       setParagraph();
-               }
                ///
-               inset_iterator(Paragraph * paragraph, lyx::pos_type pos);
+               inset_iterator();
                ///
-               inset_iterator & operator++() { // prefix ++
-                       if (par) {
-                               ++it;
-                               if (it == par->insetlist.end()) {
-                                       par = par->next();
-                                       setParagraph();
-                               }
-                       }
-                       return *this;
-               }
+               inset_iterator(base_type p, base_type e);
                ///
-               inset_iterator operator++(int) { // postfix ++
-                       inset_iterator tmp(par, it.getPos());
-                       if (par) {
-                               ++it;
-                               if (it == par->insetlist.end()) {
-                                       par = par->next();
-                                       setParagraph();
-                               }
-                       }
-                       return tmp;
-               }
+               inset_iterator(base_type p, lyx::pos_type pos, base_type e);
 
+               /// prefix ++
+               inset_iterator & operator++();
+               /// postfix ++
+               inset_iterator operator++(int);
                ///
-               Inset * operator*() { return it.getInset(); }
+               reference operator*();
+               ///
+               pointer operator->();
 
                ///
-               Paragraph * getPar() { return par; }
+               Paragraph * getPar();
                ///
-               lyx::pos_type getPos() const { return it.getPos(); }
+               lyx::pos_type getPos() const;
                ///
                friend
                bool operator==(inset_iterator const & iter1,
@@ -407,23 +389,28 @@ public:
                ///
                void setParagraph();
                ///
-               Paragraph * par;
+               ParagraphList::iterator pit;
+               ///
+               ParagraphList::iterator pend;
                ///
                InsetList::iterator it;
        };
 
        ///
        inset_iterator inset_iterator_begin() {
-               return inset_iterator(paragraph);
+               return inset_iterator(paragraphs.begin(), paragraphs.end());
        }
+
        ///
        inset_iterator inset_iterator_end() {
                return inset_iterator();
        }
+
        ///
        inset_iterator inset_const_iterator_begin() const {
-               return inset_iterator(paragraph);
+               return inset_iterator(paragraphs.begin(), paragraphs.end());
        }
+
        ///
        inset_iterator inset_const_iterator_end() const {
                return inset_iterator();
@@ -438,143 +425,9 @@ public:
        Inset * getInsetFromID(int id_arg) const;
 };
 
-
-inline
-void Buffer::addUser(BufferView * u)
-{
-       users = u;
-}
-
-
-inline
-void Buffer::delUser(BufferView *)
-{
-       users = 0;
-}
-
-
-inline
-Language const * Buffer::getLanguage() const
-{
-       return params.language;
-}
-
-
-inline
-bool Buffer::isClean() const
-{
-       return lyx_clean;
-}
-
-
-inline
-bool Buffer::isBakClean() const
-{
-       return bak_clean;
-}
-
-
-inline
-void Buffer::markClean() const
-{
-       if (!lyx_clean) {
-               lyx_clean = true;
-               updateTitles();
-       }
-       // if the .lyx file has been saved, we don't need an
-       // autosave
-       bak_clean = true;
-}
-
-
-inline
-void Buffer::markBakClean()
-{
-       bak_clean = true;
-}
-
-
-inline
-void Buffer::setUnnamed(bool flag)
-{
-       unnamed = flag;
-}
-
-
-inline
-bool Buffer::isUnnamed()
-{
-       return unnamed;
-}
-
-
-inline
-void Buffer::markDirty()
-{
-       if (lyx_clean) {
-               lyx_clean = false;
-               updateTitles();
-       }
-       bak_clean = false;
-       DEPCLEAN * tmp = dep_clean;
-       while (tmp) {
-               tmp->clean = false;
-               tmp = tmp->next;
-       }
-}
-
-
-inline
-string const & Buffer::fileName() const
-{
-       return filename_;
-}
-
-
-inline
-string const & Buffer::filePath() const
-{
-       return filepath_;
-}
-
-
-inline
-bool Buffer::isReadonly() const
-{
-       return read_only;
-}
-
-
-inline
-BufferView * Buffer::getUser() const
-{
-       return users;
-}
-
-
-inline
-void Buffer::setParentName(string const & name)
-{
-       params.parentname = name;
-}
-
-
-///
-inline
 bool operator==(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2)
-{
-       return iter1.par == iter2.par
-               && (iter1.par == 0 || iter1.it == iter2.it);
-}
+               Buffer::inset_iterator const & iter2);
 
-
-///
-inline
 bool operator!=(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2)
-{
-       return !(iter1 == iter2);
-}
-
+               Buffer::inset_iterator const & iter2);
 #endif