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 9800c8d615ca59d2e5880e8038adbbd04c66fc0a..6c1c49c3c2eabff18c6693764b07e1350d528dfb 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -261,7 +261,7 @@ Buffer * newFile(string const & filename, string const & templatename,
        }
 
        b->setReadonly(false);
-       b->fully_loaded(true);
+       b->setFullyLoaded(true);
 
        return b;
 }
@@ -293,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;
@@ -583,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();
 
@@ -627,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
@@ -642,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