adjust

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 857bbe6a6037a26f4f852eea8fe3e30acd3641d6..a8c1c4072d63dc541333aa219e1394abc75b6051 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -26,7 +26,9 @@
 #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"
@@ -346,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;
@@ -621,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();
 }
 
 
@@ -648,7 +655,7 @@ 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();