Andre's s/getTextClass/textClass/ cleanup.

[lyx.git] / src / insets / InsetFloatList.cpp

diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index 64336f6660e8f263cf9e88135569ab650056fc8e..f3299d899f7892d7c7e1fa79c892818d0c8ad6b8 100644 (file)
--- a/src/insets/InsetFloatList.cpp
+++ b/src/insets/InsetFloatList.cpp
@@ -14,28 +14,26 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "debug.h"
 #include "DispatchResult.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "FuncRequest.h"
-#include "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>
 
-namespace lyx {
-
-using support::bformat;
+using namespace std;
+using namespace lyx::support;
 
-using std::endl;
-using std::string;
-using std::ostream;
+namespace lyx {
 
 
 InsetFloatList::InsetFloatList()
@@ -50,25 +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) {
-       std::string str = s.substr(0, 6);
+bool InsetFloatList::isCompatibleCommand(string const & s)
+{
+       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());
@@ -85,17 +85,19 @@ void InsetFloatList::write(Buffer const &, 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()) {
                setParam("type", lex.getDocString());
-               LYXERR(Debug::INSETS) << "FloatList::float_type: "
-                                     << to_ascii(getParam("type")) << endl;
+               LYXERR(Debug::INSETS, "FloatList::float_type: "
+                                     << to_ascii(getParam("type")));
                if (!floats.typeExist(to_ascii(getParam("type"))))
                        lex.printError("InsetFloatList: Unknown float type: `$$Token'");
-       } else
+       } else {
                lex.printError("InsetFloatList: Parse error: `$$Token'");
+       }
+
        while (lex.isOK()) {
                lex.next();
                token = lex.getString();
@@ -112,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()) {