Fix #1736

[lyx.git] / src / buffer.h

diff --git a/src/buffer.h b/src/buffer.h
index 50b1cc2427baf88813310232f8826c6c77b70dfd..7e91df0a09f6e40fdbb130956f705ac3dff99ae1 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;
@@ -95,7 +94,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,
@@ -107,19 +106,19 @@ public:
        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.
@@ -308,6 +307,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.