Change to use preffered calling of Boost.Function

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 17f689a3a3d5198f1a45180e89fafdcb33275c63..20dd748ef0de91d9f57c17cd7f68fd775b3b927b 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -39,7 +39,7 @@ class LyXText;
 class LyXVC;
 class LaTeXFeatures;
 class Language;
-class Messages;
+class MacroData;
 class OutputParams;
 class ParagraphList;
 class ParConstIterator;
@@ -95,7 +95,7 @@ public:
            \param par if != 0 insert the file.
            \return \c false if file is not completely read.
        */
-       bool readBody(LyXLex &);
+       bool readDocument(LyXLex &);
 
        ///
        void insertStringAsLines(ParagraphList & plist,
@@ -286,58 +286,6 @@ public:
        TexRow & texrow();
        TexRow const & texrow() const;
 
-       class inset_iterator {
-       public:
-               typedef std::input_iterator_tag iterator_category;
-               typedef InsetBase value_type;
-               typedef ptrdiff_t difference_type;
-               typedef InsetBase * pointer;
-               typedef InsetBase & reference;
-               typedef lyx::par_type base_type;
-
-               ///
-               inset_iterator(ParagraphList & pars, base_type p);
-
-               /// prefix ++
-               inset_iterator & operator++();
-               /// postfix ++
-               inset_iterator operator++(int);
-               ///
-               reference operator*();
-               ///
-               pointer operator->();
-
-               ///
-               lyx::par_type getPar() const;
-               ///
-               lyx::pos_type getPos() const;
-               ///
-               friend
-               bool operator==(inset_iterator const & iter1,
-                               inset_iterator const & iter2);
-       private:
-               ///
-               void setParagraph();
-               ///
-               lyx::par_type pit;
-               ///
-               InsetList::iterator it;
-       public:
-               ParagraphList * pars_;
-       };
-
-       /// return an iterator to all *top-level* insets in the buffer
-       inset_iterator inset_iterator_begin();
-
-       /// return the end of all *top-level* insets in the buffer
-       inset_iterator inset_iterator_end();
-
-       /// return a const iterator to all *top-level* insets in the buffer
-       inset_iterator inset_const_iterator_begin() const;
-
-       /// return the const end of all *top-level* insets in the buffer
-       inset_iterator inset_const_iterator_end() const;
-
        ///
        ParIterator par_iterator_begin();
        ///
@@ -360,6 +308,18 @@ public:
        ///
        InsetBase & inset() const;
 
+       //
+       // Macro handling
+       //
+       ///
+       void buildMacros();
+       ///
+       bool hasMacro(std::string const & name) const;
+       ///
+       MacroData const & getMacro(std::string const & name) const;
+       ///
+       void insertMacro(std::string const & name, MacroData const & data);
+
 private:
        /** Inserts a file into a document
            \param par if != 0 insert the file.
@@ -376,10 +336,4 @@ private:
        boost::scoped_ptr<Impl> const pimpl_;
 };
 
-bool operator==(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2);
-
-bool operator!=(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2);
-
 #endif