PrefShortcuts: list all shortcuts (bound and unbound), using a better implementation

[lyx.git] / src / buffer_funcs.cpp

diff --git a/src/buffer_funcs.cpp b/src/buffer_funcs.cpp
index 87e97376c144834b096769aa899cfb0f1b91e035..5ce299e12fb9bc2fbc016f1c011c4e4961727e7c 100644 (file)
--- a/src/buffer_funcs.cpp
+++ b/src/buffer_funcs.cpp
@@ -23,10 +23,13 @@
 #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"
 #include "TextClassList.h"
 #include "Paragraph.h"
@@ -346,7 +349,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;
@@ -410,7 +413,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()) {
@@ -573,8 +576,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);
@@ -621,6 +624,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 +656,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();