Fix scons and CmdDef.h for the introduction of CmdDef.

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 99d03cd960b8bd30776f0bbaf14a01ce93a3ab06..6c1c49c3c2eabff18c6693764b07e1350d528dfb 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -23,9 +23,11 @@
 #include "Floating.h"
 #include "FloatList.h"
 #include "gettext.h"
+#include "InsetList.h"
 #include "InsetIterator.h"
 #include "Language.h"
 #include "LaTeX.h"
+#include "Layout.h"
 #include "LyX.h"
 #include "lyxlayout_ptr_fwd.h"
 #include "TextClass.h"
@@ -51,7 +53,6 @@
 #include "support/lyxlib.h"
 
 #include <boost/bind.hpp>
-#include <boost/filesystem/operations.hpp>
 
 using std::min;
 using std::string;
@@ -71,7 +72,6 @@ using support::onlyPath;
 using support::unlink;
 
 namespace Alert = frontend::Alert;
-namespace fs = boost::filesystem;
 
 namespace {
 
@@ -80,7 +80,7 @@ bool readFile(Buffer * const b, FileName const & s)
        BOOST_ASSERT(b);
 
        // File information about normal file
-       if (!fs::exists(s.toFilesystemEncoding())) {
+       if (!s.exists()) {
                docstring const file = makeDisplayPath(s.absFilename(), 50);
                docstring text = bformat(_("The specified document\n%1$s"
                                                     "\ncould not be read."), file);
@@ -91,10 +91,7 @@ bool readFile(Buffer * const b, FileName const & s)
        // Check if emergency save file exists and is newer.
        FileName const e(s.absFilename() + ".emergency");
 
-       if (fs::exists(e.toFilesystemEncoding()) &&
-           fs::exists(s.toFilesystemEncoding()) &&
-           fs::last_write_time(e.toFilesystemEncoding()) > fs::last_write_time(s.toFilesystemEncoding()))
-       {
+       if (e.exists() && s.exists() && e.lastModified() > s.lastModified()) {
                docstring const file = makeDisplayPath(s.absFilename(), 20);
                docstring const text =
                        bformat(_("An emergency save of the document "
@@ -118,10 +115,7 @@ bool readFile(Buffer * const b, FileName const & s)
        // Now check if autosave file is newer.
        FileName const a(onlyPath(s.absFilename()) + '#' + onlyFilename(s.absFilename()) + '#');
 
-       if (fs::exists(a.toFilesystemEncoding()) &&
-           fs::exists(s.toFilesystemEncoding()) &&
-           fs::last_write_time(a.toFilesystemEncoding()) > fs::last_write_time(s.toFilesystemEncoding()))
-       {
+       if (a.exists() && s.exists() && a.lastModified() > s.lastModified()) {
                docstring const file = makeDisplayPath(s.absFilename(), 20);
                docstring const text =
                        bformat(_("The backup of the document "
@@ -155,10 +149,10 @@ bool loadLyXFile(Buffer * b, FileName const & s)
 {
        BOOST_ASSERT(b);
 
-       if (fs::is_readable(s.toFilesystemEncoding())) {
+       if (s.isReadable()) {
                if (readFile(b, s)) {
                        b->lyxvc().file_found_hook(s);
-                       if (!fs::is_writable(s.toFilesystemEncoding()))
+                       if (!s.isWritable())
                                b->setReadonly(true);
                        return true;
                }
@@ -215,7 +209,7 @@ Buffer * checkAndLoadLyXFile(FileName const & filename)
                        return 0;
        }
 
-       if (isFileReadable(filename)) {
+       if (filename.isReadable()) {
                Buffer * b = theBufferList().newBuffer(filename.absFilename());
                if (!lyx::loadLyXFile(b, filename)) {
                        theBufferList().release(b);
@@ -267,7 +261,7 @@ Buffer * newFile(string const & filename, string const & templatename,
        }
 
        b->setReadonly(false);
-       b->fully_loaded(true);
+       b->setFullyLoaded(true);
 
        return b;
 }
@@ -299,17 +293,6 @@ void bufferErrors(Buffer const & buf, TeXErrors const & terr,
 }
 
 
-string const bufferFormat(Buffer const & buffer)
-{
-       if (buffer.isDocBook())
-               return "docbook";
-       else if (buffer.isLiterate())
-               return "literate";
-       else
-               return "latex";
-}
-
-
 int countWords(DocIterator const & from, DocIterator const & to)
 {
        int count = 0;
@@ -347,7 +330,7 @@ depth_type getDepth(DocIterator const & it)
 depth_type getItemDepth(ParIterator const & it)
 {
        Paragraph const & par = *it;
-       LYX_LABEL_TYPES const labeltype = par.layout()->labeltype;
+       LabelType const labeltype = par.layout()->labeltype;
 
        if (labeltype != LABEL_ENUMERATE && labeltype != LABEL_ITEMIZE)
                return 0;
@@ -574,8 +557,8 @@ void updateLabels(Buffer const & buf, ParIterator & parit)
                setLabel(buf, parit);
 
                // Now the insets
-               InsetList::const_iterator iit = parit->insetlist.begin();
-               InsetList::const_iterator end = parit->insetlist.end();
+               InsetList::const_iterator iit = parit->insetList().begin();
+               InsetList::const_iterator end = parit->insetList().end();
                for (; iit != end; ++iit) {
                        parit.pos() = iit->pos;
                        iit->inset->updateLabels(buf, parit);
@@ -589,7 +572,7 @@ void updateLabels(Buffer const & buf, ParIterator & parit)
 // the contents of the paragraphs.
 void updateLabels(Buffer const & buf, bool childonly)
 {
-       Buffer const * const master = buf.getMasterBuffer();
+       Buffer const * const master = buf.masterBuffer();
        // Use the master text class also for child documents
        TextClass const & textclass = master->params().getTextClass();
 
@@ -625,20 +608,21 @@ void updateLabels(Buffer const & buf, bool childonly)
        // FIXME
        // the embedding signal is emitted with structureChanged signal
        // this is inaccurate so these two will be separated later.
-       cbuf.embeddedFiles().update();
-       cbuf.embeddingChanged();
+       //cbuf.embeddedFiles().update();
+       //cbuf.embeddingChanged();
 }
 
 
 void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
 {
        if (par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
-               Buffer * master = buffer.getMasterBuffer();
+               Buffer * master = buffer.masterBuffer();
                master->tocBackend().updateItem(par_it);
                master->structureChanged();
        }
 }
 
+
 textclass_type defaultTextclass()
 {
        // We want to return the article class. if `first' is
@@ -648,24 +632,4 @@ textclass_type defaultTextclass()
        return textclasslist.numberOfClass("article").second;
 }
 
-
-void loadChildDocuments(Buffer const & buf)
-{
-       bool parse_error = false;
-               
-       for (InsetIterator it = inset_iterator_begin(buf.inset()); it; ++it) {
-               if (it->lyxCode() != Inset::INCLUDE_CODE)
-                       continue;
-               InsetInclude const & inset = static_cast<InsetInclude const &>(*it);
-               InsetCommandParams const & ip = inset.params();
-               Buffer * child = loadIfNeeded(buf, ip);
-               if (!child)
-                       continue;
-               parse_error |= !child->errorList("Parse").empty();
-               loadChildDocuments(*child);
-       }
-
-       if (use_gui && buf.getMasterBuffer() == &buf)
-               updateLabels(buf);
-}
 } // namespace lyx