saner borderline between buffer and exporter

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 5ce299e12fb9bc2fbc016f1c011c4e4961727e7c..6c1c49c3c2eabff18c6693764b07e1350d528dfb 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -53,7 +53,6 @@
 #include "support/lyxlib.h"
 
 #include <boost/bind.hpp>
-#include <boost/filesystem/operations.hpp>
 
 using std::min;
 using std::string;
@@ -73,7 +72,6 @@ using support::onlyPath;
 using support::unlink;
 
 namespace Alert = frontend::Alert;
-namespace fs = boost::filesystem;
 
 namespace {
 
@@ -82,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);
@@ -93,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 "
@@ -120,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 "
@@ -157,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;
                }
@@ -217,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);
@@ -269,7 +261,7 @@ Buffer * newFile(string const & filename, string const & templatename,
        }
 
        b->setReadonly(false);
-       b->fully_loaded(true);
+       b->setFullyLoaded(true);
 
        return b;
 }
@@ -301,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;
@@ -591,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();
 
@@ -635,12 +616,13 @@ void updateLabels(Buffer const & buf, bool childonly)
 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
@@ -650,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() != 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