Pimpl Buffer.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7719 a592a061-630c-0410-9148-cb99ea01b6c8

src/BufferView.C

@@ -22,9 +22,11 @@
 #include "gettext.h"
 #include "iterators.h"
 #include "language.h"
+#include "lyxlayout.h"
 #include "lyxtext.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
+#include "texrow.h"
 #include "undo_funcs.h"
 #include "WordLangTuple.h"
 

src/BufferView_pimpl.C

@@ -22,6 +22,7 @@
 #include "buffer.h"
 #include "buffer_funcs.h"
 #include "bufferlist.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "factory.h"
 #include "FloatList.h"

src/ChangeLog

@@ -1,3 +1,10 @@
+2003-09-09  Angus Leeming  <leeming@lyx.org>
+
+	* buffer.[Ch]: Add an Impl class and move Buffer's member variables into it.
+	As a result move several header files out of buffer.h.
+
+	Add header files to lots of .C files all over the tree as a result.
+
 2003-09-09  Angus Leeming  <leeming@lyx.org>
 
 	* buffer.[Ch]: make Buffer's member variables private. Add accessor functions.

src/CutAndPaste.C

@@ -15,6 +15,7 @@
 #include "CutAndPaste.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "errorlist.h"
 #include "gettext.h"
 #include "iterators.h"

src/InsetList.C

@@ -12,8 +12,10 @@
 #include <config.h>
 
 #include "InsetList.h"
-#include "BufferView.h"
+
 #include "buffer.h"
+#include "bufferparams.h"
+#include "BufferView.h"
 #include "debug.h"
 
 #include "insets/insetbranch.h"

src/MenuBackend.C

@@ -16,6 +16,7 @@
 #include <config.h>
 
 #include "MenuBackend.h"
+#include "bufferparams.h"
 #include "lyxlex.h"
 #include "LyXAction.h"
 #include "debug.h"

src/ParagraphParameters.C

@@ -19,6 +19,7 @@
 #include "buffer.h"
 #include "BufferView.h"
 #include "gettext.h"
+#include "lyxlayout.h"
 #include "lyxlex.h"
 #include "lyxtext.h"
 #include "paragraph.h"

src/buffer.C

@@ -14,6 +14,7 @@
 
 #include "buffer_funcs.h"
 #include "bufferlist.h"
+#include "bufferparams.h"
 #include "Chktex.h"
 #include "debug.h"
 #include "errorlist.h"
@@ -27,10 +28,12 @@
 #include "LyXAction.h"
 #include "lyxlex.h"
 #include "lyxrc.h"
+#include "lyxvc.h"
 #include "messages.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
 #include "sgml.h"
+#include "texrow.h"
 #include "undo.h"
 #include "version.h"
 
@@ -105,22 +108,64 @@ bool openFileWrite(ofstream & ofs, string const & fname)
 	return true;
 }
 
-
 } // namespace anon
 
+
+typedef std::map<string, bool> DepClean;
+
+struct Buffer::Impl 
+{
+	Impl(Buffer & parent, string const & file, bool readonly);
+
+	limited_stack<Undo> undostack;
+	limited_stack<Undo> redostack;
+	BufferParams params;
+	ParagraphList paragraphs;
+	LyXVC lyxvc;
+	string temppath;
+	bool nicefile;
+	TexRow texrow;
+
+	/// need to regenerate .tex ?
+	DepClean dep_clean;
+
+	/// is save needed
+	mutable bool lyx_clean;
+
+	/// is autosave needed
+	mutable bool bak_clean;
+
+	/// is this a unnamed file (New...)
+	bool unnamed;
+
+	/// buffer is r/o
+	bool read_only;
+
+	/// name of the file the buffer is associated with.
+	string filename;
+
+	/// The path to the document file.
+	string filepath;
+
+	boost::scoped_ptr<Messages> messages;
+};
+
+
+Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_)
+	: nicefile(true),
+	  lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_),
+	  filename(file), filepath(OnlyPath(file))
+{
+	lyxvc.buffer(&parent);
+	if (readonly_ || lyxrc.use_tempdir)
+		temppath = CreateBufferTmpDir();
+}
+
+
 Buffer::Buffer(string const & file, bool ronly)
-	: nicefile_(true), lyx_clean(true), bak_clean(true),
-	  unnamed(false), read_only(ronly),
-	  filename_(file)
+	: pimpl_(new Impl(*this, file, ronly))
 {
 	lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl;
-	filepath_ = OnlyPath(file);
-	lyxvc().buffer(this);
-	if (read_only || lyxrc.use_tempdir) {
-		temppath_ = CreateBufferTmpDir();
-	} else {
-		temppath_.erase();
-	}
 
 	// set initial author
 	authors().record(Author(lyxrc.user_name, lyxrc.user_email));
@@ -149,91 +194,91 @@ Buffer::~Buffer()
 
 limited_stack<Undo> & Buffer::undostack()
 {
-	return undostack_;
+	return pimpl_->undostack;
 }
 
 
 limited_stack<Undo> const & Buffer::undostack() const
 {
-	return undostack_;
+	return pimpl_->undostack;
 }
 
 
 limited_stack<Undo> & Buffer::redostack()
 {
-	return redostack_;
+	return pimpl_->redostack;
 }
 
 
 limited_stack<Undo> const & Buffer::redostack() const
 {
-	return redostack_;
+	return pimpl_->redostack;
 }
 
 
 BufferParams & Buffer::params()
 {
-	return params_;
+	return pimpl_->params;
 }
 
 
 BufferParams const & Buffer::params() const
 {
-	return params_;
+	return pimpl_->params;
 }
 
 
 ParagraphList & Buffer::paragraphs()
 {
-	return paragraphs_;
+	return pimpl_->paragraphs;
 }
 
 
 ParagraphList const & Buffer::paragraphs() const
 {
-	return paragraphs_;
+	return pimpl_->paragraphs;
 }
 
 
 LyXVC & Buffer::lyxvc()
 {
-	return lyxvc_;
+	return pimpl_->lyxvc;
 }
 
 
 LyXVC const & Buffer::lyxvc() const
 {
-	return lyxvc_;
+	return pimpl_->lyxvc;
 }
 
 
 string const & Buffer::temppath() const
 {
-	return temppath_;
+	return pimpl_->temppath;
 }
 
 
 bool & Buffer::niceFile()
 {
-	return nicefile_;
+	return pimpl_->nicefile;
 }
 
 
 bool Buffer::niceFile() const
 {
-	return nicefile_;
+	return pimpl_->nicefile;
 }
 
 
 TexRow & Buffer::texrow()
 {
-	return texrow_;
+	return pimpl_->texrow;
 }
 
 
 TexRow const & Buffer::texrow() const
 {
-	return texrow_;
+	return pimpl_->texrow;
 }
 
 
@@ -281,8 +326,8 @@ pair<Buffer::LogType, string> const Buffer::getLogName() const
 
 void Buffer::setReadonly(bool flag)
 {
-	if (read_only != flag) {
-		read_only = flag;
+	if (pimpl_->read_only != flag) {
+		pimpl_->read_only = flag;
 		readonly(flag);
 	}
 }
@@ -296,9 +341,9 @@ AuthorList & Buffer::authors()
 
 void Buffer::setFileName(string const & newfile)
 {
-	filename_ = MakeAbsPath(newfile);
-	filepath_ = OnlyPath(filename_);
-	setReadonly(IsFileWriteable(filename_) == 0);
+	pimpl_->filename = MakeAbsPath(newfile);
+	pimpl_->filepath = OnlyPath(pimpl_->filename);
+	setReadonly(IsFileWriteable(pimpl_->filename) == 0);
 	updateTitles();
 }
 
@@ -705,7 +750,7 @@ bool Buffer::save() const
 
 bool Buffer::writeFile(string const & fname) const
 {
-	if (read_only && (fname == fileName())) {
+	if (pimpl_->read_only && (fname == fileName())) {
 		return false;
 	}
 
@@ -1192,7 +1237,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
 		ofs << "<!doctype linuxdoc system";
 
 		string preamble = params().preamble;
-		string const name = nice ? ChangeExtension(filename_, ".sgml")
+		string const name = nice ? ChangeExtension(pimpl_->filename, ".sgml")
 			 : fname;
 		preamble += features.getIncludedFiles(name);
 		preamble += features.getLyXSGMLEntities();
@@ -1621,7 +1666,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 		    << "  PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
 
 		string preamble = params().preamble;
-		string const name = nice ? ChangeExtension(filename_, ".sgml")
+		string const name = nice ? ChangeExtension(pimpl_->filename, ".sgml")
 			 : fname;
 		preamble += features.getIncludedFiles(name);
 		preamble += features.getLyXSGMLEntities();
@@ -2107,8 +2152,8 @@ void Buffer::fillWithBibKeys(std::vector<std::pair<string, string> > & keys) con
 
 bool Buffer::isDepClean(string const & name) const
 {
-	DepClean::const_iterator it = dep_clean_.find(name);
-	if (it == dep_clean_.end())
+	DepClean::const_iterator it = pimpl_->dep_clean.find(name);
+	if (it == pimpl_->dep_clean.end())
 		return true;
 	return it->second;
 }
@@ -2116,7 +2161,7 @@ bool Buffer::isDepClean(string const & name) const
 
 void Buffer::markDepClean(string const & name)
 {
-	dep_clean_[name] = true;
+	pimpl_->dep_clean[name] = true;
 }
 
 
@@ -2165,7 +2210,7 @@ void Buffer::changeLanguage(Language const * from, Language const * to)
 
 void Buffer::updateDocLang(Language const * nlang)
 {
-	messages_.reset(new Messages(nlang->code()));
+	pimpl_->messages.reset(new Messages(nlang->code()));
 }
 
 
@@ -2280,8 +2325,8 @@ Language const * Buffer::getLanguage() const
 
 string const Buffer::B_(string const & l10n) const
 {
-	if (messages_.get()) {
-		return messages_->get(l10n);
+	if (pimpl_->messages.get()) {
+		return pimpl_->messages->get(l10n);
 	}
 
 	return _(l10n);
@@ -2290,56 +2335,56 @@ string const Buffer::B_(string const & l10n) const
 
 bool Buffer::isClean() const
 {
-	return lyx_clean;
+	return pimpl_->lyx_clean;
 }
 
 
 bool Buffer::isBakClean() const
 {
-	return bak_clean;
+	return pimpl_->bak_clean;
 }
 
 
 void Buffer::markClean() const
 {
-	if (!lyx_clean) {
-		lyx_clean = true;
+	if (!pimpl_->lyx_clean) {
+		pimpl_->lyx_clean = true;
 		updateTitles();
 	}
 	// if the .lyx file has been saved, we don't need an
 	// autosave
-	bak_clean = true;
+	pimpl_->bak_clean = true;
 }
 
 
 void Buffer::markBakClean()
 {
-	bak_clean = true;
+	pimpl_->bak_clean = true;
 }
 
 
 void Buffer::setUnnamed(bool flag)
 {
-	unnamed = flag;
+	pimpl_->unnamed = flag;
 }
 
 
 bool Buffer::isUnnamed()
 {
-	return unnamed;
+	return pimpl_->unnamed;
 }
 
 
 void Buffer::markDirty()
 {
-	if (lyx_clean) {
-		lyx_clean = false;
+	if (pimpl_->lyx_clean) {
+		pimpl_->lyx_clean = false;
 		updateTitles();
 	}
-	bak_clean = false;
+	pimpl_->bak_clean = false;
 
-	DepClean::iterator it = dep_clean_.begin();
-	DepClean::const_iterator const end = dep_clean_.end();
+	DepClean::iterator it = pimpl_->dep_clean.begin();
+	DepClean::const_iterator const end = pimpl_->dep_clean.end();
 
 	for (; it != end; ++it) {
 		it->second = false;
@@ -2349,19 +2394,19 @@ void Buffer::markDirty()
 
 string const & Buffer::fileName() const
 {
-	return filename_;
+	return pimpl_->filename;
 }
 
 
 string const & Buffer::filePath() const
 {
-	return filepath_;
+	return pimpl_->filepath;
 }
 
 
 bool Buffer::isReadonly() const
 {
-	return read_only;
+	return pimpl_->read_only;
 }
 
 

src/buffer.h

@@ -12,11 +12,8 @@
 #ifndef BUFFER_H
 #define BUFFER_H
 
-#include "bufferparams.h"
 #include "InsetList.h"
-#include "lyxvc.h"
 #include "ParagraphList_fwd.h"
-#include "texrow.h"
 
 #include "support/limited_stack.h"
 #include "support/types.h"
@@ -33,8 +30,12 @@
 
 
 class AuthorList;
+class BufferParams;
 class ErrorItem;
+class LyXFont;
+class LyXLex;
 class LyXRC;
+class LyXVC;
 class LaTeXFeatures;
 class LatexRunParams;
 class Language;
@@ -42,6 +43,7 @@ class Messages;
 class ParIterator;
 class ParConstIterator;
 class TeXErrors;
+class TexRow;
 class Undo;
 
 
@@ -301,51 +303,6 @@ public:
 	/// the author list for the document
 	AuthorList & authors();
 
-private:
-	/** Inserts a file into a document
-	    \param par if != 0 insert the file.
-	    \return \c false if method fails.
-	*/
-	bool readFile(LyXLex &, string const & filename,
-		      ParagraphList::iterator pit);
-
-	bool do_writeFile(std::ostream & ofs) const;
-
-	limited_stack<Undo> undostack_;
-	limited_stack<Undo> redostack_;
-	BufferParams params_;
-	ParagraphList paragraphs_;
-	LyXVC lyxvc_;
-	string temppath_;
-	bool nicefile_;
-	TexRow texrow_;
-
-	typedef std::map<string, bool> DepClean;
-
-	/// need to regenerate .tex ?
-	DepClean dep_clean_;
-
-	/// is save needed
-	mutable bool lyx_clean;
-
-	/// is autosave needed
-	mutable bool bak_clean;
-
-	/// is this a unnamed file (New...)
-	bool unnamed;
-
-	/// buffer is r/o
-	bool read_only;
-
-	/// name of the file the buffer is associated with.
-	string filename_;
-
-	/// The path to the document file.
-	string filepath_;
-
-	///
-	boost::scoped_ptr<Messages> messages_;
-public:
 	///
 	class inset_iterator {
 	public:
@@ -414,6 +371,21 @@ public:
 
 	///
 	InsetOld * getInsetFromID(int id_arg) const;
+
+private:
+	/** Inserts a file into a document
+	    \param par if != 0 insert the file.
+	    \return \c false if method fails.
+	*/
+	bool readFile(LyXLex &, string const & filename,
+		      ParagraphList::iterator pit);
+
+	bool do_writeFile(std::ostream & ofs) const;
+
+	/// Use the Pimpl idiom to hide the internals.
+	class Impl;
+	/// The pointer never changes although *pimpl_'s contents may.
+	boost::scoped_ptr<Impl> const pimpl_;
 };
 
 bool operator==(Buffer::inset_iterator const & iter1,

src/buffer_funcs.C

@@ -16,10 +16,13 @@
 
 #include "buffer.h"
 #include "bufferlist.h"
+#include "bufferparams.h"
 #include "errorlist.h"
 #include "gettext.h"
 #include "LaTeX.h"
 #include "paragraph.h"
+#include "lyxvc.h"
+#include "texrow.h"
 #include "vc-backend.h"
 
 #include "frontends/Alert.h"

src/bufferlist.C

@@ -13,6 +13,7 @@
 #include "bufferlist.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "gettext.h"
 #include "lastfiles.h"

src/bufferview_funcs.C

@@ -16,6 +16,7 @@
 #include "bufferview_funcs.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "gettext.h"
 #include "language.h"

src/converter.C

@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "converter.h"
+#include "bufferparams.h"
 #include "format.h"
 #include "buffer.h"
 #include "buffer_funcs.h"

src/exporter.C

@@ -20,6 +20,7 @@
 
 #include "buffer.h"
 #include "buffer_funcs.h"
+#include "bufferparams.h"
 #include "converter.h"
 #include "format.h"
 #include "gettext.h"

src/factory.C

@@ -11,11 +11,13 @@
 #include <config.h>
 
 #include "factory.h"
-#include "funcrequest.h"
+
 #include "buffer.h"
-#include "FloatList.h"
-#include "debug.h"
 #include "BufferView.h"
+#include "bufferparams.h"
+#include "debug.h"
+#include "FloatList.h"
+#include "funcrequest.h"
 #include "lyxlex.h"
 
 #include "insets/insetbibitem.h"

src/format.C

@@ -12,6 +12,7 @@
 
 #include "format.h"
 #include "buffer.h"
+#include "bufferparams.h"
 #include "lyxrc.h"
 #include "debug.h"
 #include "gettext.h"

src/frontends/LyXView.C

@@ -18,6 +18,7 @@
 #include "Menubar.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
 #include "debug.h"

src/frontends/controllers/ControlChanges.C

@@ -12,6 +12,7 @@
 
 #include "ControlChanges.h"
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "changes.h"
 #include "funcrequest.h"

src/frontends/controllers/ControlCharacter.C

@@ -14,6 +14,7 @@
 #include "ButtonController.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "bufferview_funcs.h"
 #include "funcrequest.h"
 #include "language.h"

src/frontends/controllers/ControlCitation.C

@@ -13,6 +13,7 @@
 #include "ControlCitation.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 
 using std::vector;
 using std::pair;

src/frontends/controllers/ControlDocument.C

@@ -15,6 +15,7 @@
 
 #include "buffer.h"
 #include "buffer_funcs.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "CutAndPaste.h"
 #include "errorlist.h"

src/frontends/controllers/ControlDocument.h

@@ -13,11 +13,14 @@
 #define CONTROLDOCUMENT_H
 
 #include "ControlDialog_impl.h"
-#include "bufferparams.h"
+
+#include "support/types.h"
 
 #include <boost/scoped_ptr.hpp>
 
+class BufferParams;
 class Language;
+class LyXTextClass;
 
 
 /** A controller for Document dialogs.

src/frontends/controllers/ControlPreamble.C

@@ -16,6 +16,7 @@
 #include "ViewBase.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "gettext.h"
 
 #include "frontends/LyXView.h"

src/frontends/controllers/ControlPrint.C

@@ -16,6 +16,7 @@
 #include "ButtonController.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "gettext.h"
 #include "helper_funcs.h"
 #include "PrinterParams.h"

src/frontends/controllers/ControlSpellchecker.C

@@ -12,12 +12,14 @@
 
 #include "ControlSpellchecker.h"
 #include "ViewBase.h"
+
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
+#include "debug.h"
 #include "gettext.h"
 #include "language.h"
 #include "lyxrc.h"
-#include "debug.h"
 
 #include "ispell.h"
 #ifdef USE_PSPELL

src/frontends/controllers/ControlVCLog.C

@@ -14,6 +14,7 @@
 #include "ControlVCLog.h"
 #include "buffer.h"
 #include "gettext.h"
+#include "lyxvc.h"
 #include "support/lyxlib.h"
 #include <fstream>
 

src/frontends/gtk/GToolbar.C

@@ -17,6 +17,7 @@
 #include "lyxfunc.h"
 #include "FuncStatus.h"
 #include "buffer.h"
+#include "bufferparams.h"
 #include "funcrequest.h"
 #include "gettext.h"
 #include "Tooltips.h"

src/frontends/qt2/QDocument.C

@@ -16,7 +16,7 @@
 #include "QDocument.h"
 #include "QDocumentDialog.h"
 
-
+#include "bufferparams.h"
 #include "language.h"
 #include "helper_funcs.h" // getSecond()
 #include "frnt_lang.h"

src/frontends/qt2/QDocumentDialog.C

@@ -15,14 +15,13 @@
 
 #include "ControlDocument.h"
 #include "QDocument.h"
-
-
 #include "QDocumentDialog.h"
 
 #include "panelstack.h"
 #include "floatplacement.h"
 
 #include "support/lstrings.h"
+#include "bufferparams.h"
 #include "lyxrc.h"
 
 

src/frontends/qt2/QGraphics.C

@@ -18,7 +18,7 @@
 #include "support/tostr.h"
 #include "support/lyxlib.h"
 #include "insets/insetgraphicsParams.h"
-//#include "bufferparams.h"
+
 #include "lyxrc.h"
 #include "lengthcombo.h"
 #include "qt_helpers.h"

src/frontends/qt2/QLToolbar.C

@@ -12,12 +12,13 @@
 
 #include <config.h>
 
+#include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
-#include "gettext.h"
-#include "lyxfunc.h"
 #include "funcrequest.h"
 #include "FuncStatus.h"
-#include "buffer.h"
+#include "gettext.h"
+#include "lyxfunc.h"
 
 #include "QtView.h"
 #include "QLToolbar.h"

src/frontends/screen.C

@@ -20,6 +20,7 @@
 
 #include "BufferView.h"
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "language.h"
 #include "lyxfont.h"

src/frontends/xforms/FormDocument.C

@@ -31,6 +31,7 @@
 #include "controllers/frnt_lang.h"
 #include "controllers/helper_funcs.h"
 
+#include "bufferparams.h"
 #include "language.h"
 #include "lyxrc.h"
 #include "lyxtextclasslist.h"

src/frontends/xforms/FormPreferences.C

@@ -25,6 +25,7 @@
 #include "converter.h"
 #include "format.h"
 #include "frnt_lang.h"
+#include "lyxfont.h"
 
 #include "support/LAssert.h"
 #include "support/lstrings.h"

src/frontends/xforms/XFormsToolbar.C

@@ -20,6 +20,7 @@
 #include "XFormsView.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "funcrequest.h"
 #include "FuncStatus.h"

src/graphics/PreviewLoader.C

@@ -22,6 +22,8 @@
 
 #include "frontends/lyx_gui.h" // hexname
 
+#include "insets/inset.h"
+
 #include "support/filetools.h"
 #include "support/forkedcall.h"
 #include "support/forkedcontr.h"

src/graphics/Previews.C

@@ -16,6 +16,8 @@
 #include "buffer.h"
 #include "lyxrc.h"
 
+#include "insets/inset.h"
+
 #include "support/LAssert.h"
 
 namespace support = lyx::support;

src/insets/insetbibtex.C

@@ -13,6 +13,7 @@
 #include "insetbibtex.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "funcrequest.h"
 #include "gettext.h"

src/insets/insetbranch.C

@@ -13,6 +13,7 @@
 #include "insetbranch.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "funcrequest.h"
 #include "gettext.h"

src/insets/insetcaption.C

@@ -15,6 +15,7 @@
 #include "insetwrap.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "Floating.h"
 #include "FloatList.h"

src/insets/insetcite.C

@@ -14,6 +14,7 @@
 #include "insetcite.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "funcrequest.h"
 #include "LaTeXFeatures.h"

src/insets/insetert.C

@@ -13,6 +13,7 @@
 #include "insetert.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "funcrequest.h"

src/insets/insetfloat.C

@@ -14,6 +14,7 @@
 #include "insetfloat.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "Floating.h"

src/insets/insetfloatlist.C

@@ -13,6 +13,7 @@
 #include "insetfloatlist.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "Floating.h"
 #include "FloatList.h"

src/insets/insetinclude.C

@@ -15,6 +15,7 @@
 #include "buffer.h"
 #include "buffer_funcs.h"
 #include "bufferlist.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "funcrequest.h"

src/insets/insetquotes.C

@@ -13,6 +13,7 @@
 #include "insetquotes.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "language.h"
 #include "LaTeXFeatures.h"

src/insets/insettabular.C

@@ -13,6 +13,7 @@
 #include "insettabular.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "funcrequest.h"

src/insets/insettext.C

@@ -14,6 +14,7 @@
 #include "insetnewline.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "CutAndPaste.h"
 #include "debug.h"
@@ -30,6 +31,7 @@
 #include "ParagraphParameters.h"
 #include "rowpainter.h"
 #include "sgml.h"
+#include "texrow.h"
 #include "undo_funcs.h"
 #include "WordLangTuple.h"
 

src/insets/insetwrap.C

@@ -13,6 +13,7 @@
 #include "insetwrap.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "Floating.h"

src/lyx_cb.C

@@ -23,6 +23,7 @@
 #include "gettext.h"
 #include "lastfiles.h"
 #include "lyx_main.h"
+#include "lyxlayout.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
 #include "paragraph.h"

src/lyxfunc.C

@@ -24,6 +24,7 @@
 #include "buffer.h"
 #include "buffer_funcs.h"
 #include "bufferlist.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "encoding.h"
@@ -41,6 +42,7 @@
 #include "lyxrc.h"
 #include "lyxrow.h"
 #include "lyxserver.h"
+#include "lyxvc.h"
 #include "paragraph.h"
 #include "ParagraphParameters.h"
 #include "TextCache.h"

src/paragraph.C

@@ -21,6 +21,7 @@
 #include "paragraph_pimpl.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "encoding.h"
 #include "debug.h"
 #include "gettext.h"
@@ -28,6 +29,7 @@
 #include "latexrunparams.h"
 #include "lyxrc.h"
 #include "lyxrow.h"
+#include "texrow.h"
 
 #include "insets/insetbibitem.h"
 #include "insets/insetoptarg.h"

src/paragraph_funcs.C

@@ -13,6 +13,8 @@
 #include "paragraph_funcs.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
+
 #include "debug.h"
 #include "encoding.h"
 #include "errorlist.h"
@@ -23,6 +25,7 @@
 #include "lyxlex.h"
 #include "lyxrc.h"
 #include "paragraph_pimpl.h"
+#include "texrow.h"
 
 #include "insets/insetbibitem.h"
 #include "insets/insethfill.h"

src/rowpainter.C

@@ -14,6 +14,7 @@
 #include "rowpainter.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "encoding.h"
 #include "gettext.h"

src/tabular.C

@@ -20,6 +20,7 @@
 #include "tabular.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
 #include "lyxlex.h"

src/text.C

@@ -19,6 +19,7 @@
 #include "lyxtext.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "encoding.h"

src/text2.C

@@ -23,6 +23,7 @@
 
 #include "buffer.h"
 #include "buffer_funcs.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "counters.h"
 #include "CutAndPaste.h"

src/text3.C

@@ -18,6 +18,7 @@
 #include "lyxtext.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "factory.h"

src/toc.C

@@ -14,6 +14,7 @@
 #include "toc.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "funcrequest.h"
 #include "iterators.h"
 #include "LyXAction.h"

src/vspace.C

@@ -11,9 +11,10 @@
 #include <config.h>
 
 #include "vspace.h"
-#include "lengthcommon.h"
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
+#include "lengthcommon.h"
 #include "lyxtext.h"
 
 #include "support/lstrings.h"