X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.cpp;h=05aa0b461de1e5833d62a5567ca3ff43d18f251b;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=c9e5a2572c4930db556ea08962034b0fa4d4f7b3;hpb=f1c4a07544439dba1d02106b03ab5394b720f291;p=lyx.git

diff --git a/src/MenuBackend.cpp b/src/MenuBackend.cpp
index c9e5a2572c..05aa0b461d 100644
--- 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>
 
@@ -599,7 +599,7 @@ void expandFloatListInsert(Menu & tomenu, Buffer const * buf)
 	}
 
 	FloatList const & floats =
-		buf->params().getTextClass().floats();
+		buf->params().textClass().floats();
 	FloatList::const_iterator cit = floats.begin();
 	FloatList::const_iterator end = floats.end();
 	for (; cit != end; ++cit) {
@@ -621,7 +621,7 @@ void expandFloatInsert(Menu & tomenu, Buffer const * buf)
 	}
 
 	FloatList const & floats =
-		buf->params().getTextClass().floats();
+		buf->params().textClass().floats();
 	FloatList::const_iterator cit = floats.begin();
 	FloatList::const_iterator end = floats.end();
 	for (; cit != end; ++cit) {
@@ -642,13 +642,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 +743,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();