X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=7f19fd1f58e55f159e435f31f76589ac978c07dc;hb=b8550d11e836e857967a31250e6ca248b2d43f82;hp=297e63208ce126bf5110d47a62f428f3292ffd73;hpb=ce87e6767cdbcf5c424f2e9e0fdeb32d13376ab9;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index 297e63208c..7f19fd1f58 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -12,13 +12,13 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
+#include "OutputEnums.h"
 #include "update_flags.h"
 
 #include "insets/InsetCode.h"
 
 #include "support/strfwd.h"
 #include "support/types.h"
-#include "support/SignalSlot.h"
 
 #include <list>
 #include <set>
@@ -34,7 +34,6 @@ class BufferSet;
 class DispatchResult;
 class DocIterator;
 class docstring_list;
-class ErrorItem;
 class ErrorList;
 class FuncRequest;
 class FuncStatus;
@@ -44,7 +43,6 @@ class InsetLabel;
 class Font;
 class Format;
 class Lexer;
-class LyXRC;
 class Text;
 class LyXVC;
 class LaTeXFeatures;
@@ -249,8 +247,6 @@ public:
 	/// return true if the main lyx file does not need saving
 	bool isClean() const;
 	///
-	bool isBakClean() const;
-	///
 	bool isDepClean(std::string const & name) const;
 
 	/// whether or not disk file has been externally modified
@@ -262,9 +258,6 @@ public:
 	/// mark the main lyx file as not needing saving
 	void markClean() const;
 
-	///
-	void markBakClean() const;
-
 	///
 	void markDepClean(std::string const & name);
 
@@ -365,7 +358,7 @@ public:
 	/// Updates the cached bibliography information.
 	/// Note that you MUST call this method to update the cache. It will
 	/// not happen otherwise. (Currently, it is called at the start of
-	/// updateLabels() and from GuiCitation.)
+	/// updateBuffer() and from GuiCitation.)
 	void checkBibInfoCache() const;
 	/// \return the bibliography information for this buffer's master,
 	/// or just for it, if it isn't a child.
@@ -380,6 +373,8 @@ public:
 
 	///
 	bool isMultiLingual() const;
+	///
+	std::set<Language const *> getLanguages() const;
 
 	///
 	BufferParams & params();
@@ -491,8 +486,6 @@ public:
 	void errors(std::string const & err, bool from_master = false) const;
 	/// This function is called when the buffer busy status change.
 	void setBusy(bool on) const;
-	/// This function is called when the buffer readonly status change.
-	void setReadOnly(bool on) const;
 	/// Update window titles of all users.
 	void updateTitles() const;
 	/// Reset autosave timers for all users.
@@ -535,7 +528,7 @@ public:
 	bool isExportableFormat(std::string const & format) const;
 
 	///
-	typedef std::vector<std::pair<InsetRef *, ParIterator> > References;
+	typedef std::vector<std::pair<Inset *, ParIterator> > References;
 	References & references(docstring const & label);
 	References const & references(docstring const & label) const;
 	void clearReferenceCache() const;
@@ -552,13 +545,13 @@ public:
 	/// Updates screen labels and some other information associated with
 	/// insets and paragraphs. Actually, it's more like a general "recurse
 	/// through the Buffer" routine, that visits all the insets and paragraphs.
-	void updateLabels() const { updateLabels(UpdateMaster, false); }
+	void updateBuffer() const { updateBuffer(UpdateMaster, InternalUpdate); }
 	/// \param scope: whether to start with the master document or just
 	/// do this one.
 	/// \param output: whether we are preparing for output.
-	void updateLabels(UpdateScope scope, bool output) const;
+	void updateBuffer(UpdateScope scope, UpdateType utype) const;
 	/// 
-	void updateLabels(ParIterator & parit, bool output) const;
+	void updateBuffer(ParIterator & parit, UpdateType utype) const;
 
 	/// Spellcheck starting from \p from.
 	/// \p from initial position, will then points to the next misspelled
@@ -568,21 +561,10 @@ public:
 	/// \return progress if a new word was found.
 	int spellCheck(DocIterator & from, DocIterator & to,
 		WordLangTuple & word_lang, docstring_list & suggestions) const;
-
-private:
-	/// search for macro in local (buffer) table or in children
-	MacroData const * getBufferMacro(docstring const & name,
-					 DocIterator const & pos) const;
-	/** Update macro table starting with position of it
-	    \param it in some text inset
-	*/
-	void updateMacros(DocIterator & it,
-				     DocIterator & scope) const;
 	///
-	void setLabel(ParIterator & it) const;
-	///
-	void collectRelatives(BufferSet & bufs) const;
+	void checkChildBuffers();
 
+private:
 	///
 	bool readFileHelper(support::FileName const & s);
 	///
@@ -592,29 +574,13 @@ private:
 	*/
 	ReadStatus readFile(Lexer &, support::FileName const & filename,
 			    bool fromString = false);
-
-	/** If we have branches that use the file suffix
-	    feature, return the file name with suffix appended.
-	*/
-	support::FileName exportFileName() const;
+	///
+	void getLanguages(std::set<Language const *> &) const;
 
 	/// Use the Pimpl idiom to hide the internals.
 	class Impl;
 	/// The pointer never changes although *pimpl_'s contents may.
 	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_;
 };