X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloatList.cpp;h=f3299d899f7892d7c7e1fa79c892818d0c8ad6b8;hb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;hp=ed18d6f2f9c05ac8a4c6ed91d75753b3a466a598;hpb=b89cc942eb458284f40f4d4e7db58890c3288979;p=lyx.git

diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index ed18d6f2f9..f3299d899f 100644
--- a/src/insets/InsetFloatList.cpp
+++ b/src/insets/InsetFloatList.cpp
@@ -14,18 +14,18 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "support/debug.h"
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "TocBackend.h"
 #include "TextClass.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 
 #include <ostream>
@@ -48,26 +48,27 @@ InsetFloatList::InsetFloatList(string const & type)
 }
 
 
-CommandInfo const * InsetFloatList::findInfo(std::string const & /* cmdName */)
+ParamInfo const & InsetFloatList::findInfo(string const & /* cmdName */)
 {
-	static const char * const paramnames[] = {"type", ""};
-	static const bool isoptional[] = {false};
-	static const CommandInfo info = {1, paramnames, isoptional};
-	return &info;
+	static ParamInfo param_info_;
+	if (param_info_.empty()) {
+		param_info_.add("type", false);
+	}
+	return param_info_;
 }
 
 
 //HACK
-bool InsetFloatList::isCompatibleCommand(std::string const & s)
+bool InsetFloatList::isCompatibleCommand(string const & s)
 {
-	std::string str = s.substr(0, 6);
+	string str = s.substr(0, 6);
 	return str == "listof";
 }
 
 
 docstring const InsetFloatList::getScreenLabel(Buffer const & buf) const
 {
-	FloatList const & floats = buf.params().getTextClass().floats();
+	FloatList const & floats = buf.params().textClass().floats();
 	FloatList::const_iterator it = floats[to_ascii(getParam("type"))];
 	if (it != floats.end())
 		return buf.B_(it->second.listName());
@@ -76,7 +77,7 @@ docstring const InsetFloatList::getScreenLabel(Buffer const & buf) const
 }
 
 
-void InsetFloatList::write(Buffer const &, std::ostream & os) const
+void InsetFloatList::write(Buffer const &, ostream & os) const
 {
 	os << "FloatList " << to_ascii(getParam("type")) << "\n";
 }
@@ -84,7 +85,7 @@ void InsetFloatList::write(Buffer const &, std::ostream & os) const
 
 void InsetFloatList::read(Buffer const & buf, Lexer & lex)
 {
-	FloatList const & floats = buf.params().getTextClass().floats();
+	FloatList const & floats = buf.params().textClass().floats();
 	string token;
 
 	if (lex.eatLine()) {
@@ -113,7 +114,7 @@ void InsetFloatList::read(Buffer const & buf, Lexer & lex)
 int InsetFloatList::latex(Buffer const & buf, odocstream & os,
 			  OutputParams const &) const
 {
-	FloatList const & floats = buf.params().getTextClass().floats();
+	FloatList const & floats = buf.params().textClass().floats();
 	FloatList::const_iterator cit = floats[to_ascii(getParam("type"))];
 
 	if (cit != floats.end()) {