After a hiatus, I'm returning to the rewrite of InsetCommandParams, the purpose of...

[lyx.git] / src / MenuBackend.cpp

diff --git a/src/MenuBackend.cpp b/src/MenuBackend.cpp
index 6dfdafb18759e0087b32cd4983756f7947dcca7f..fce89d6c25d5998d8b0230120869f4a74ae34ecf 100644 (file)
--- a/src/MenuBackend.cpp
+++ b/src/MenuBackend.cpp
@@ -23,11 +23,9 @@
 #include "BufferParams.h"
 #include "Converter.h"
 #include "CutAndPaste.h"
-#include "support/debug.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Format.h"
-#include "support/gettext.h"
 #include "KeyMap.h"
 #include "Session.h"
 #include "LyXAction.h"
@@ -41,9 +39,11 @@
 
 #include "frontends/Application.h"
 
+#include "support/convert.h"
+#include "support/debug.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/convert.h"
 
 #include <boost/bind.hpp>
 
@@ -598,8 +598,7 @@ void expandFloatListInsert(Menu & tomenu, Buffer const * buf)
                return;
        }
 
-       FloatList const & floats =
-               buf->params().getTextClass().floats();
+       FloatList const & floats = buf->params().textClass().floats();
        FloatList::const_iterator cit = floats.begin();
        FloatList::const_iterator end = floats.end();
        for (; cit != end; ++cit) {
@@ -620,8 +619,7 @@ void expandFloatInsert(Menu & tomenu, Buffer const * buf)
                return;
        }
 
-       FloatList const & floats =
-               buf->params().getTextClass().floats();
+       FloatList const & floats = buf->params().textClass().floats();
        FloatList::const_iterator cit = floats.begin();
        FloatList::const_iterator end = floats.end();
        for (; cit != end; ++cit) {
@@ -642,13 +640,13 @@ void expandFlexInsert(Menu & tomenu, Buffer const * buf, string s)
                                    FuncRequest(LFUN_NOACTION)));
                return;
        }
-       InsetLayouts const & insetlayouts =
-               buf->params().getTextClass().insetlayouts();
-       InsetLayouts::const_iterator cit = insetlayouts.begin();
-       InsetLayouts::const_iterator end = insetlayouts.end();
+       InsetLayouts const & insetLayouts =
+               buf->params().textClass().insetLayouts();
+       InsetLayouts::const_iterator cit = insetLayouts.begin();
+       InsetLayouts::const_iterator end = insetLayouts.end();
        for (; cit != end; ++cit) {
                docstring const label = cit->first;
-               if (cit->second.lyxtype == s)
+               if (cit->second.lyxtype() == s)
                        tomenu.addWithStatusCheck(MenuItem(MenuItem::Command, 
                                label, FuncRequest(LFUN_FLEX_INSERT,
                                                label)));
@@ -743,7 +741,7 @@ void expandToc(Menu & tomenu, Buffer const * buf)
                tomenu.add(MenuItem(MenuItem::Command, _("Master Document"), f));
        }
 
-       FloatList const & floatlist = buf->params().getTextClass().floats();
+       FloatList const & floatlist = buf->params().textClass().floats();
        TocList const & toc_list = buf->tocBackend().tocs();
        TocList::const_iterator cit = toc_list.begin();
        TocList::const_iterator end = toc_list.end();
@@ -768,6 +766,8 @@ void expandToc(Menu & tomenu, Buffer const * buf)
                        label = _(floatName);
                // BUG3633: listings is not a proper float so its name
                // is not shown in floatlist.
+               else if (cit->first == "equation")
+                       label = _("List of Equations");
                else if (cit->first == "index")
                        label = _("List of Indexes");
                else if (cit->first == "listing")