Change string

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

diff --git a/src/insets/InsetFloatList.cpp b/src/insets/InsetFloatList.cpp
index cec2f9737280a7420050123dfaadbbb20e5c9c89..3251b50936fb5235784a29cfd74d80da280e8ac1 100644 (file)
--- a/src/insets/InsetFloatList.cpp
+++ b/src/insets/InsetFloatList.cpp
@@ -14,28 +14,27 @@
 
 #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>
 
 using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
-
 
 InsetFloatList::InsetFloatList()
        : InsetCommand(InsetCommandParams(FLOAT_LIST_CODE), "toc")
@@ -49,43 +48,44 @@ 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", ParamInfo::LATEX_REQUIRED);
+       }
+       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
+docstring InsetFloatList::screenLabel() const
 {
-       FloatList const & floats = buf.params().getTextClass().floats();
+       FloatList const & floats = buffer().params().documentClass().floats();
        FloatList::const_iterator it = floats[to_ascii(getParam("type"))];
        if (it != floats.end())
-               return buf.B_(it->second.listName());
+               return buffer().B_(it->second.listName());
        else
                return _("ERROR: Nonexistent float type!");
 }
 
 
-void InsetFloatList::write(Buffer const &, std::ostream & os) const
+void InsetFloatList::write(ostream & os) const
 {
        os << "FloatList " << to_ascii(getParam("type")) << "\n";
 }
 
 
-void InsetFloatList::read(Buffer const & buf, Lexer & lex)
+void InsetFloatList::read(Lexer & lex)
 {
-       FloatList const & floats = buf.params().getTextClass().floats();
+       FloatList const & floats = buffer().params().documentClass().floats();
        string token;
 
        if (lex.eatLine()) {
@@ -111,10 +111,9 @@ void InsetFloatList::read(Buffer const & buf, Lexer & lex)
 }
 
 
-int InsetFloatList::latex(Buffer const & buf, odocstream & os,
-                         OutputParams const &) const
+int InsetFloatList::latex(odocstream & os, OutputParams const &) const
 {
-       FloatList const & floats = buf.params().getTextClass().floats();
+       FloatList const & floats = buffer().params().documentClass().floats();
        FloatList::const_iterator cit = floats[to_ascii(getParam("type"))];
 
        if (cit != floats.end()) {
@@ -130,7 +129,7 @@ int InsetFloatList::latex(Buffer const & buf, odocstream & os,
                        }
                } else {
                        os << "\\listof{" << getParam("type") << "}{"
-                          << buf.B_(cit->second.listName()) << "}\n";
+                          << buffer().B_(cit->second.listName()) << "}\n";
                }
        } else {
                os << "%%\\listof{" << getParam("type") << "}{"
@@ -141,12 +140,11 @@ int InsetFloatList::latex(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetFloatList::plaintext(Buffer const & buffer, odocstream & os,
-                             OutputParams const &) const
+int InsetFloatList::plaintext(odocstream & os, OutputParams const &) const
 {
-       os << getScreenLabel(buffer) << "\n\n";
+       os << screenLabel() << "\n\n";
 
-       buffer.tocBackend().writePlaintextTocList(to_ascii(getParam("type")), os);
+       buffer().tocBackend().writePlaintextTocList(to_ascii(getParam("type")), os);
 
        return PLAINTEXT_NEWLINE;
 }