X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.h;h=01537b9b6362908609fa9c2faef240dab10a2461;hb=69036ced3765f40048d62be800c98af3ea2d1b4a;hp=5d33bd82c962b99492cc8bc002ed2c13be641254;hpb=a4e56ba6139af12234afa4dd797f358e9a736326;p=lyx.git

diff --git a/src/Buffer.h b/src/Buffer.h
index 5d33bd82c9..01537b9b63 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -13,7 +13,6 @@
 #define BUFFER_H
 
 #include "OutputEnums.h"
-#include "update_flags.h"
 
 #include "insets/InsetCode.h"
 
@@ -34,17 +33,15 @@ class BufferSet;
 class DispatchResult;
 class DocIterator;
 class docstring_list;
-class ErrorItem;
 class ErrorList;
 class FuncRequest;
 class FuncStatus;
 class Inset;
-class InsetRef;
 class InsetLabel;
+class InsetRef;
 class Font;
 class Format;
 class Lexer;
-class LyXRC;
 class Text;
 class LyXVC;
 class LaTeXFeatures;
@@ -360,7 +357,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.
@@ -375,6 +372,8 @@ public:
 
 	///
 	bool isMultiLingual() const;
+	///
+	std::set<Language const *> getLanguages() const;
 
 	///
 	BufferParams & params();
@@ -505,7 +504,7 @@ public:
 	///
 	void moveAutosaveFile(support::FileName const & old) const;
 	///
-	support::FileName getAutosaveFilename() const;
+	support::FileName getAutosaveFileName() const;
 
 	/// return the format of the buffer on a string
 	std::string bufferFormat() const;
@@ -528,7 +527,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;
@@ -545,13 +544,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, InternalUpdate); }
+	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, UpdateType utype) const;
+	void updateBuffer(UpdateScope scope, UpdateType utype) const;
 	/// 
-	void updateLabels(ParIterator & parit, UpdateType utype) const;
+	void updateBuffer(ParIterator & parit, UpdateType utype) const;
 
 	/// Spellcheck starting from \p from.
 	/// \p from initial position, will then points to the next misspelled
@@ -561,21 +560,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, UpdateType utype) const;
-	///
-	void collectRelatives(BufferSet & bufs) const;
+	void checkChildBuffers();
 
+private:
 	///
 	bool readFileHelper(support::FileName const & s);
 	///
@@ -585,11 +573,8 @@ 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;