adjust

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 8db089a47cd18c34850b8628568ed7a4ece82bc9..a8c1c4072d63dc541333aa219e1394abc75b6051 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -26,8 +26,11 @@
 #include "InsetIterator.h"
 #include "Language.h"
 #include "LaTeX.h"
+#include "Layout.h"
 #include "LyX.h"
+#include "lyxlayout_ptr_fwd.h"
 #include "TextClass.h"
+#include "TextClassList.h"
 #include "Paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphList.h"
@@ -345,7 +348,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;
@@ -409,7 +412,7 @@ void setLabel(Buffer const & buf, ParIterator & it)
 {
        TextClass const & textclass = buf.params().getTextClass();
        Paragraph & par = it.paragraph();
-       Layout_ptr const & layout = par.layout();
+       LayoutPtr const & layout = par.layout();
        Counters & counters = textclass.counters();
 
        if (par.params().startOfAppendix()) {
@@ -620,6 +623,11 @@ void updateLabels(Buffer const & buf, bool childonly)
        cbuf.tocBackend().update();
        if (!childonly)
                cbuf.structureChanged();
+       // FIXME
+       // the embedding signal is emitted with structureChanged signal
+       // this is inaccurate so these two will be separated later.
+       //cbuf.embeddedFiles().update();
+       //cbuf.embeddingChanged();
 }
 
 
@@ -632,13 +640,22 @@ void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
        }
 }
 
+textclass_type defaultTextclass()
+{
+       // We want to return the article class. if `first' is
+       // true in the returned pair, then `second' is the textclass
+       // number; if it is false, second is 0. In both cases, second
+       // is what we want.
+       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)
+               if (it->lyxCode() != INCLUDE_CODE)
                        continue;
                InsetInclude const & inset = static_cast<InsetInclude const &>(*it);
                InsetCommandParams const & ip = inset.params();
@@ -652,5 +669,4 @@ void loadChildDocuments(Buffer const & buf)
        if (use_gui && buf.getMasterBuffer() == &buf)
                updateLabels(buf);
 }
-
 } // namespace lyx