]> git.lyx.org Git - lyx.git/commitdiff
Pimpl Buffer.
authorAngus Leeming <leeming@lyx.org>
Tue, 9 Sep 2003 11:24:33 +0000 (11:24 +0000)
committerAngus Leeming <leeming@lyx.org>
Tue, 9 Sep 2003 11:24:33 +0000 (11:24 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7719 a592a061-630c-0410-9148-cb99ea01b6c8

60 files changed:
src/BufferView.C
src/BufferView_pimpl.C
src/ChangeLog
src/CutAndPaste.C
src/InsetList.C
src/MenuBackend.C
src/ParagraphParameters.C
src/buffer.C
src/buffer.h
src/buffer_funcs.C
src/bufferlist.C
src/bufferview_funcs.C
src/converter.C
src/exporter.C
src/factory.C
src/format.C
src/frontends/LyXView.C
src/frontends/controllers/ControlChanges.C
src/frontends/controllers/ControlCharacter.C
src/frontends/controllers/ControlCitation.C
src/frontends/controllers/ControlDocument.C
src/frontends/controllers/ControlDocument.h
src/frontends/controllers/ControlPreamble.C
src/frontends/controllers/ControlPrint.C
src/frontends/controllers/ControlSpellchecker.C
src/frontends/controllers/ControlVCLog.C
src/frontends/gtk/GToolbar.C
src/frontends/qt2/QDocument.C
src/frontends/qt2/QDocumentDialog.C
src/frontends/qt2/QGraphics.C
src/frontends/qt2/QLToolbar.C
src/frontends/screen.C
src/frontends/xforms/FormDocument.C
src/frontends/xforms/FormPreferences.C
src/frontends/xforms/XFormsToolbar.C
src/graphics/PreviewLoader.C
src/graphics/Previews.C
src/insets/insetbibtex.C
src/insets/insetbranch.C
src/insets/insetcaption.C
src/insets/insetcite.C
src/insets/insetert.C
src/insets/insetfloat.C
src/insets/insetfloatlist.C
src/insets/insetinclude.C
src/insets/insetquotes.C
src/insets/insettabular.C
src/insets/insettext.C
src/insets/insetwrap.C
src/lyx_cb.C
src/lyxfunc.C
src/paragraph.C
src/paragraph_funcs.C
src/rowpainter.C
src/tabular.C
src/text.C
src/text2.C
src/text3.C
src/toc.C
src/vspace.C

index b3fbaef95f906b4433908c31fad9677dd300a70e..1dae06d81ef7e0b75c86be7ec4fe4ab274bf23ca 100644 (file)
 #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"
 
index 6ddbbd4c31fd52d03c489783b7c98289a9b7b2b4..e6486788700b5fde6ecd9dd06e24f839b83c3da9 100644 (file)
@@ -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"
index ac7c7a130896bf2eb08f67663437a8280893b35d..6206b6c6e62110ef2c3ddd4fcd530113b6fceb0b 100644 (file)
@@ -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.
index 3e787f98083ea396eacdb4602831abcddfff26c7..f3224be904e6bc3feb9f7aa16c0f974f3dfa9d8b 100644 (file)
@@ -15,6 +15,7 @@
 #include "CutAndPaste.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "errorlist.h"
 #include "gettext.h"
 #include "iterators.h"
index 365944ecbd5ef40d16cfdfaef5b90278b5009121..0aa299d8bcd084aebe89d87e347a6416cb4c5f8a 100644 (file)
 #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"
index d5b1aefaa2f19c2ac08e89da0bb2cf82c12c112c..8bf98ed6e79938392d68c8e3f8f25dc816f77c5b 100644 (file)
@@ -16,6 +16,7 @@
 #include <config.h>
 
 #include "MenuBackend.h"
+#include "bufferparams.h"
 #include "lyxlex.h"
 #include "LyXAction.h"
 #include "debug.h"
index ef62737f6dec279f3fbb1b717a9c60b731488a75..f2f1468e0bae17c12f8ed3399956dccb68149010 100644 (file)
@@ -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"
index 328f310bdd3be54782c35502ca00dde10a1bc895..f1e59aef48902953a66f744adec332c85c964d1a 100644 (file)
@@ -14,6 +14,7 @@
 
 #include "buffer_funcs.h"
 #include "bufferlist.h"
+#include "bufferparams.h"
 #include "Chktex.h"
 #include "debug.h"
 #include "errorlist.h"
 #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;
 }
 
 
index 6d79e86e766057771b73f62ddc35dbfe0a1c0c63..d2fd7ec4c2397859f0888d910283f091c7743a75 100644 (file)
 #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"
 
 
 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,
index 44b3be4e15daab7e7f7721b7d7589e6b082f049f..e06b32ad843e0d6354117c149f9c1ff62d75b142 100644 (file)
 
 #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"
index 13dc6528ba634971cc0bf0a9f823dec8a0450b0e..36ca2e4143c593eb9c99387ef08a99e4c35233bb 100644 (file)
@@ -13,6 +13,7 @@
 #include "bufferlist.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "gettext.h"
 #include "lastfiles.h"
index eb1f21eb8a2de01118ae8edf0bf43030caa37def..e66a2d4e47817a9ec7a2ca5235e225ad0c28174d 100644 (file)
@@ -16,6 +16,7 @@
 #include "bufferview_funcs.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "gettext.h"
 #include "language.h"
index 1f8c880bc99d9140533e2210ade1bb7855a2afd1..7f7ef49fa0e2844176e3dbb6b53e403d5229eecd 100644 (file)
@@ -11,6 +11,7 @@
 #include <config.h>
 
 #include "converter.h"
+#include "bufferparams.h"
 #include "format.h"
 #include "buffer.h"
 #include "buffer_funcs.h"
index b3fc84ac5e9082b52aabd4e4e32dbb9c699da663..6076fb4c6c7c2846e9d7129aa8a137c4e87da96e 100644 (file)
@@ -20,6 +20,7 @@
 
 #include "buffer.h"
 #include "buffer_funcs.h"
+#include "bufferparams.h"
 #include "converter.h"
 #include "format.h"
 #include "gettext.h"
index 847c6ef4c73cd25508c91f008fd58506b356d237..882c6cc896c3a4b41571bfd01ce57b621fc08f2c 100644 (file)
 #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"
index 864a67afa3b89264b3c1f07d7c4bab2e5c91846a..fd9a07e4a54577b2d9d4234a5cf97a187e21ef5b 100644 (file)
@@ -12,6 +12,7 @@
 
 #include "format.h"
 #include "buffer.h"
+#include "bufferparams.h"
 #include "lyxrc.h"
 #include "debug.h"
 #include "gettext.h"
index fd664b67e31548f55087b865ddc150c2a3ebad23..c7933098b696b8f1ce0015a15cf128a32b86ebf7 100644 (file)
@@ -18,6 +18,7 @@
 #include "Menubar.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "bufferview_funcs.h"
 #include "debug.h"
index 322e1d0d1abb535eaf8f686c8ee1336605c91ba0..6e10040b67859775ad6f2c67f4dce965aa62fe82 100644 (file)
@@ -12,6 +12,7 @@
 
 #include "ControlChanges.h"
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "changes.h"
 #include "funcrequest.h"
index a90797cebf1c1ad1ab6b306a3c4507636b036922..409fb6627272b9650219cc392478c6087962f323 100644 (file)
@@ -14,6 +14,7 @@
 #include "ButtonController.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "bufferview_funcs.h"
 #include "funcrequest.h"
 #include "language.h"
index d71eb099bdbde6e9d5d3fa3a91fb09c5aad39539..30496e4218711a1ceabe6a350534da47c4b8a95b 100644 (file)
@@ -13,6 +13,7 @@
 #include "ControlCitation.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 
 using std::vector;
 using std::pair;
index d1e46859f5c8b99fdc2544328622b35d071eb69d..e2ff56b86d7275067275f5635f2cc352f0e3325d 100644 (file)
@@ -15,6 +15,7 @@
 
 #include "buffer.h"
 #include "buffer_funcs.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "CutAndPaste.h"
 #include "errorlist.h"
index 77003af318fb28c6ceb1387d45c030d3fd65a57f..3661f93294b4c289d684a096f9053f9c5e5706c4 100644 (file)
 #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.
index 5041710345669367121bb970ef1eb9008230159c..dc6a225f3d95e8fa169541488e507ddfce9da3c4 100644 (file)
@@ -16,6 +16,7 @@
 #include "ViewBase.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "gettext.h"
 
 #include "frontends/LyXView.h"
index d86e65c338130063e538461eb4b990fea7561b00..71f21dbfb26a28f9ca1b39adbd3d0eb75beec950 100644 (file)
@@ -16,6 +16,7 @@
 #include "ButtonController.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "gettext.h"
 #include "helper_funcs.h"
 #include "PrinterParams.h"
index 981c80683782d917c706365e5fc4d67fab7c9183..c02e5ff0141ee7fcf054e6032b1d80a415ae1c3d 100644 (file)
 
 #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
index b4a5b9a5b836222fc321d4f81252a2f5b1b4141d..78fad86c36db5b55ad3ee356e2ea8c3a567301ce 100644 (file)
@@ -14,6 +14,7 @@
 #include "ControlVCLog.h"
 #include "buffer.h"
 #include "gettext.h"
+#include "lyxvc.h"
 #include "support/lyxlib.h"
 #include <fstream>
 
index c219e62e225b8d113577e6ca4da3cb8b73087425..bcdee147009907205a68f25d1f39b71b27590592 100644 (file)
@@ -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"
index 188453d43582c76a3f977d42b6dbc0f3eb5eccca..ef676f08c8ab2584d51dcc2cb1171ddf9625f308 100644 (file)
@@ -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"
index 7112f29376309db51cc0266aa24b9fdbf3afc6d8..1b9314de11ab3025f92c7253b2f0513327332828 100644 (file)
 
 #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"
 
 
index 84b1e901061256f30f8d30242bfa320e66df13e8..9a30657cff58246fbeeae68896f7587493401063 100644 (file)
@@ -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"
index 49247c097292ce8bfaf12e93936232a54f8e9380..f9bfe50f5a7c1b1e51ca2fd07d48cab1b6deca4f 100644 (file)
 
 #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"
index 353409cc1f78ade578a74c47d5b25a566a4f4911..eae3c0f6edce1bbe9a64fe16156e30be0c2eb73f 100644 (file)
@@ -20,6 +20,7 @@
 
 #include "BufferView.h"
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "language.h"
 #include "lyxfont.h"
index 8bf07f1664e6d57ab5b8936d92cd79be65f26a87..3b548e7368cf806c95f0452322f93e4113f519ff 100644 (file)
@@ -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"
index f8c5ac63b7616df2307c17ee9b930f3c7c8e364e..1b64cdbeeafbe4ef85cd8b27a6eada823b762213 100644 (file)
@@ -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"
index 6c818ceec870064b3b1e52c83b7bfe091ed986fd..79efe679099724570ca0dffe88b120945b224e4d 100644 (file)
@@ -20,6 +20,7 @@
 #include "XFormsView.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "funcrequest.h"
 #include "FuncStatus.h"
index e3a0157e30a6df49cc1ef6dbc15be7b8b74fe7e8..80008db6b5f1e2ba565c09fe41f531fffb9d81b3 100644 (file)
@@ -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"
index acda22cf6a37000b080bd323d48993413de86dea..3aa53e5bdfd57cc99c9a795cf4d577069d31bf8d 100644 (file)
@@ -16,6 +16,8 @@
 #include "buffer.h"
 #include "lyxrc.h"
 
+#include "insets/inset.h"
+
 #include "support/LAssert.h"
 
 namespace support = lyx::support;
index 556078b2ca2cbb41cfaadf8c3274f1f31eedb963..4ea4402abcb4bf2ba22d40968b47611cca36ccc8 100644 (file)
@@ -13,6 +13,7 @@
 #include "insetbibtex.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "funcrequest.h"
 #include "gettext.h"
index 97ca20713dfd721b312e9881eae94fdac7efdd80..100fd72ed789f8e15d19d0a0605f447377e27d98 100644 (file)
@@ -13,6 +13,7 @@
 #include "insetbranch.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "funcrequest.h"
 #include "gettext.h"
index 3bd53670ab9b5548e583ec78050a06c624cee4f3..434ee2a3cbc70f07d054a77a1ed99af8b1439f8d 100644 (file)
@@ -15,6 +15,7 @@
 #include "insetwrap.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "Floating.h"
 #include "FloatList.h"
index 716db6c8f8b7f2cd65b570d28c018c3c56e0124c..37021c38ca68543a2dae32dea413aa51805d3cba 100644 (file)
@@ -14,6 +14,7 @@
 #include "insetcite.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "funcrequest.h"
 #include "LaTeXFeatures.h"
index c0d5e3afaa285e9b7afd0967cfca0a0807af9180..5e530c4f96b643fe30d89b41adebdf360fa3ae48 100644 (file)
@@ -13,6 +13,7 @@
 #include "insetert.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "funcrequest.h"
index 4640c0578417fc48b5ae48b0cdcb0061c08fae58..84d2487e37524500780534f7173de0a5196d374c 100644 (file)
@@ -14,6 +14,7 @@
 #include "insetfloat.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "Floating.h"
index abd849d9565486e054fcff9739c088e70658c6cc..4bb1c9cd4510fe918934dc5477f7fd54c2d60ca4 100644 (file)
@@ -13,6 +13,7 @@
 #include "insetfloatlist.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "Floating.h"
 #include "FloatList.h"
index 7d4dce810dc7c9b950c26795cf06e4d41b2ae98b..8e7300e83f6cee0ca69a17d35a51778634c6560d 100644 (file)
@@ -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"
index 551bf80c1edf24e2ab23a8ebab0a0aab0a3bc16a..b360672baf109756434497ec1c1bf6064ce6a334 100644 (file)
@@ -13,6 +13,7 @@
 #include "insetquotes.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "language.h"
 #include "LaTeXFeatures.h"
index bbc4f28e2b3f849429b02fb1bc33ca30e900df3d..43924e5616e124fb7ce1d24d879473a620ba17de 100644 (file)
@@ -13,6 +13,7 @@
 #include "insettabular.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "funcrequest.h"
index 29dcd9acf58e966ca398ebf0b25361fcb93acd7f..3ab0859bceac09831623ecffefbc7f850f82ea45 100644 (file)
@@ -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"
 
index d0420410f81a261e869664f9c13f7490caae607f..3b9500d1f678202a41b45f02d8862fdd9e1c89ba 100644 (file)
@@ -13,6 +13,7 @@
 #include "insetwrap.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "Floating.h"
index efa81e1e71f828e5fe0b4e9c9b094cd95ea27558..e48207320c54ad6509307fdfce10f09dfa1afbca 100644 (file)
@@ -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"
index 2e1a32a1daf0bc92a9b3ddf444d2beb5fac2431d..c4171271c327728c7095362fedb8b4a6fa74d49d 100644 (file)
@@ -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"
index 9aa673bded3c6aa6705ff28fd6c1514e39cb3693..dd5386c8eb7590a5c99138b08e7c397e3f5ebd77 100644 (file)
@@ -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"
index 0d3234783fbaf494796f89149bb52f4c956cfebd..b590512d42b34c91a84b117dae62fff6ea87a157 100644 (file)
@@ -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"
index f9b150e3a26680697e500d46e4d55f39f5f68299..c8257c86317f8df8b8147d731ba5d71318f6311e 100644 (file)
@@ -14,6 +14,7 @@
 #include "rowpainter.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "encoding.h"
 #include "gettext.h"
index 31d17525ea321f9ad8cee255924c2cc4895a0867..1de4f606ca673afe861c9bd9150d551457298f25 100644 (file)
@@ -20,6 +20,7 @@
 #include "tabular.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
 #include "lyxlex.h"
index 1f8da29386b75b83a348ce590f1ae8506e8c5615..b46c2981fe0abd583e273e37c0dbf7d13cfe4808 100644 (file)
@@ -19,6 +19,7 @@
 #include "lyxtext.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "encoding.h"
index c941d875fc919065569c251305742d396c2e62dc..6d9d7759ceec52c7a7d0443f20ec101b7e0581bc 100644 (file)
@@ -23,6 +23,7 @@
 
 #include "buffer.h"
 #include "buffer_funcs.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "counters.h"
 #include "CutAndPaste.h"
index 2492657b7b54c8deaa12e673f6d782b99e4e0366..1d3c67779174fc1c4f8f8a6273d22574203cc12b 100644 (file)
@@ -18,6 +18,7 @@
 #include "lyxtext.h"
 
 #include "buffer.h"
+#include "bufferparams.h"
 #include "BufferView.h"
 #include "debug.h"
 #include "factory.h"
index 6ce183334128ba4384a24c5c692d14bd7734f995..f8fef96b30cae3d81102dfb0de7c8645a242c332 100644 (file)
--- a/src/toc.C
+++ b/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"
index 0855987d808733290bf83231cbe83f65ba4f95f9..512e64eefca9c516a50d0cb154732989850001ec 100644 (file)
 #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"