Revert 23154.

[lyx.git] / src / Buffer.h

diff --git a/src/Buffer.h b/src/Buffer.h
index 9dd0fc38a4483bf323e26a65177af79c2781d0fa..ace9986f23880a6e5111f255335618e1d3ba39d8 100644 (file)
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -16,8 +16,8 @@
 
 #include "support/strfwd.h"
 #include "support/types.h"
+#include "support/SignalSlot.h"
 
-#include <set>
 #include <string>
 #include <vector>
 
@@ -25,7 +25,7 @@
 namespace lyx {
 
 class BufferParams;
-class EmbeddedFiles;
+class EmbeddedFileList;
 class DocIterator;
 class ErrorItem;
 class ErrorList;
@@ -40,6 +40,7 @@ class LyXVC;
 class LaTeXFeatures;
 class Language;
 class MacroData;
+class MacroNameSet;
 class OutputParams;
 class Paragraph;
 class ParConstIterator;
@@ -49,6 +50,7 @@ class TeXErrors;
 class TexRow;
 class TocBackend;
 class Undo;
+class WordList;
 
 namespace frontend {
 class GuiBufferDelegate;
@@ -57,7 +59,6 @@ class WorkAreaManager;
 
 namespace support {
 class FileName;
-class FileNameList;
 }
 
 /** The buffer object.
@@ -144,7 +145,7 @@ public:
                pit_type &, pos_type &,
                Font const &, docstring const &, bool);
        ///
-       ParIterator getParFromID(int id) const;
+       DocIterator getParFromID(int id) const;
        /// do we have a paragraph with this id?
        bool hasParWithID(int id) const;
 
@@ -304,7 +305,7 @@ public:
        void updateBibfilesCache() const;
        /// Return the cache with all bibfiles in use (including bibfiles
        /// of loaded child documents).
-       support::FileNameList const & getBibfilesCache() const;
+       EmbeddedFileList const & getBibfilesCache() const;
        ///
        void getLabelList(std::vector<docstring> &) const;
 
@@ -366,7 +367,6 @@ public:
        /// Iterate through the whole buffer and try to resolve macros
        void updateMacroInstances() const;
 
-       typedef std::set<docstring> MacroNameSet;
        /// List macro names of this buffer. the parent and the children
        void listMacroNames(MacroNameSet & macros) const;
        /// Write out all macros somewhere defined in the parent,
@@ -405,8 +405,9 @@ public:
        TocBackend & tocBackend() const;
        
        //@{
-       EmbeddedFiles & embeddedFiles();
-       EmbeddedFiles const & embeddedFiles() const;
+       EmbeddedFileList & embeddedFiles();
+       EmbeddedFileList const & embeddedFiles() const;
+       bool embedded() const;
        //@}
 
        Undo & undo();
@@ -452,6 +453,11 @@ public:
        ///
        std::vector<Format const *> exportableFormats(bool only_viewable) const;
 
+       /// Register word for completion word list.
+       void registerWord(docstring const & word);
+       ///
+       WordList const & registeredWords() const;
+       
 private:
        /// search for macro in local (buffer) table or in children
        MacroData const * getBufferMacro(docstring const & name,
@@ -492,6 +498,17 @@ private:
        Impl * const d;
 
        frontend::GuiBufferDelegate * gui_;
+
+       /// This function is called when the buffer structure is changed.
+       Signal structureChanged_;
+       /// This function is called when some parsing error shows up.
+       //Signal errors(std::string const &) = 0;
+       /// This function is called when some message shows up.
+       //Signal message(docstring const &) = 0;
+       /// This function is called when the buffer busy status change.
+       //Signal setBusy(bool) = 0;
+       /// Reset autosave timers for all users.
+       Signal resetAutosaveTimers_;
 };