- Link against qt-mt333.lib which is what the current qt3 cvs produces

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 17f689a3a3d5198f1a45180e89fafdcb33275c63..9e7b9a1675eb96d4ba5c41e4888be304cd0a734e 100644 (file)
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -18,8 +18,7 @@
 #include "support/types.h"
 
 #include <boost/scoped_ptr.hpp>
-#include <boost/signals/signal0.hpp>
-#include <boost/signals/signal1.hpp>
+#include <boost/signal.hpp>
 
 #include <iosfwd>
 #include <map>
@@ -39,7 +38,7 @@ class LyXText;
 class LyXVC;
 class LaTeXFeatures;
 class Language;
-class Messages;
+class MacroData;
 class OutputParams;
 class ParagraphList;
 class ParConstIterator;
@@ -86,7 +85,7 @@ public:
        /// load a new file
        bool readFile(std::string const & filename);
 
-       bool readFile(std::string const & filename, lyx::par_type pit);
+       bool readFile(std::string const & filename, lyx::pit_type pit);
 
        /// read the header, returns number of unknown tokens
        int readHeader(LyXLex & lex);
@@ -95,31 +94,31 @@ 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,
-               lyx::par_type &, lyx::pos_type &,
-               LyXFont const &, std::string const &);
+               lyx::pit_type &, lyx::pos_type &,
+               LyXFont const &, std::string const &, bool);
        ///
        ParIterator getParFromID(int id) const;
        /// do we have a paragraph with this id?
        bool hasParWithID(int id) const;
 
        /// This signal is emitted when a parsing error shows up.
-       boost::signal1<void, ErrorItem> error;
+       boost::signal<void(ErrorItem)> error;
        /// This signal is emitted when some message shows up.
-       boost::signal1<void, std::string> message;
+       boost::signal<void(std::string)> message;
        /// This signal is emitted when the buffer busy status change.
-       boost::signal1<void, bool> busy;
+       boost::signal<void(bool)> busy;
        /// This signal is emitted when the buffer readonly status change.
-       boost::signal1<void, bool> readonly;
+       boost::signal<void(bool)> readonly;
        /// Update window titles of all users.
-       boost::signal0<void> updateTitles;
+       boost::signal<void()> updateTitles;
        /// Reset autosave timers for all users.
-       boost::signal0<void> resetAutosaveTimers;
+       boost::signal<void()> resetAutosaveTimers;
        /// This signal is emitting if the buffer is being closed.
-       boost::signal0<void> closing;
+       boost::signal<void()> closing;
 
 
        /** Save file.
@@ -286,58 +285,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,13 +307,25 @@ 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.
            \return \c false if method fails.
        */
        bool readFile(LyXLex &, std::string const & filename,
-                     lyx::par_type pit);
+                     lyx::pit_type pit);
 
        bool do_writeFile(std::ostream & ofs) const;
 
@@ -376,10 +335,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