Inset::addToToc(): change signature. Use DocIterator instead of ParConstIterator...

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

diff --git a/src/insets/InsetFlex.cpp b/src/insets/InsetFlex.cpp
index 9555cb2461a1bc69bdd18430af5741152095cd01..1972f52295008016d09b6f3c6d007702bc90ae20 100644 (file)
--- a/src/insets/InsetFlex.cpp
+++ b/src/insets/InsetFlex.cpp
@@ -16,11 +16,6 @@
 
 #include "Buffer.h"
 #include "BufferParams.h"
-#include "BufferView.h"
-#include "DispatchResult.h"
-#include "FuncRequest.h"
-#include "FuncStatus.h"
-#include "Cursor.h"
 #include "support/gettext.h"
 #include "LaTeXFeatures.h"
 #include "Lexer.h"
@@ -30,26 +25,20 @@
 #include "paragraph_funcs.h"
 #include "sgml.h"
 
-#include "frontends/FontMetrics.h"
-#include "frontends/Painter.h"
-
-#include "support/convert.h"
-
-#include <sstream>
+#include <ostream>
 
 using namespace std;
 
 namespace lyx {
 
 
-InsetFlex::InsetFlex(BufferParams const & bp,
-       TextClassPtr tc, string const & layoutName)
-       : InsetCollapsable(bp, Collapsed, tc),
-       name_(layoutName)
+InsetFlex::InsetFlex(Buffer const & buf, string const & layoutName)
+       : InsetCollapsable(buf, Collapsed), name_(layoutName)
 {
-       setLayout(tc); // again, because now the name is initialized
-       packages_ = getLayout().requires;
-       preamble_ = getLayout().preamble;
+       // again, because now the name is initialized
+       setLayout(buf.params().documentClassPtr());
+       packages_ = getLayout().requires();
+       preamble_ = getLayout().preamble();
 }
 
 
@@ -58,86 +47,70 @@ InsetFlex::InsetFlex(InsetFlex const & in)
 {}
 
 
-Inset * InsetFlex::clone() const
-{
-       return new InsetFlex(*this);
-}
-
-
-bool InsetFlex::undefined() const
-{
-       return getLayout().labelstring == from_utf8("UNDEFINED");
-}
-
-
-docstring const InsetFlex::editMessage() const
+docstring InsetFlex::editMessage() const
 {
        return _("Opened Flex Inset");
 }
 
 
-void InsetFlex::write(Buffer const & buf, ostream & os) const
+void InsetFlex::write(ostream & os) const
 {
-       os << "Flex " << name_ << "\n";
-       InsetCollapsable::write(buf, os);
+       os << "Flex " <<
+               (name_.empty() ? "undefined" : name_) << "\n";
+       InsetCollapsable::write(os);
 }
 
 
-void InsetFlex::read(Buffer const & buf, Lexer & lex)
+void InsetFlex::read(Lexer & lex)
 {
+       string token;
        while (lex.isOK()) {
-               lex.next();
-               string token = lex.getString();
-
+               lex >> token;
                if (token == "Flex") {
                        lex.next();
                        name_ = lex.getString();
-               }
-
-               // This is handled in Collapsable
-               else if (token == "status") {
+               } else if (token == "status") {
+                       // This is handled in Collapsable
                        lex.pushToken(token);
                        break;
                }
        }
-       InsetCollapsable::read(buf, lex);
+       InsetCollapsable::read(lex);
 }
 
 
-int InsetFlex::plaintext(Buffer const & buf, odocstream & os,
-                             OutputParams const & runparams) const
+int InsetFlex::plaintext(odocstream & os, OutputParams const & runparams) const
 {
-       return InsetText::plaintext(buf, os, runparams);
+       return InsetText::plaintext(os, runparams);
 }
 
 
-int InsetFlex::docbook(Buffer const & buf, odocstream & os,
-                           OutputParams const & runparams) const
+int InsetFlex::docbook(odocstream & os, OutputParams const & runparams) const
 {
        ParagraphList::const_iterator beg = paragraphs().begin();
        ParagraphList::const_iterator par = paragraphs().begin();
        ParagraphList::const_iterator end = paragraphs().end();
 
        if (!undefined())
-               sgml::openTag(os, getLayout().latexname,
-                             par->getID(buf, runparams) + getLayout().latexparam);
+               sgml::openTag(os, getLayout().latexname(),
+                             par->getID(buffer(), runparams) + getLayout().latexparam());
 
        for (; par != end; ++par) {
-               par->simpleDocBookOnePar(buf, os, runparams,
+               par->simpleDocBookOnePar(buffer(), os, runparams,
                                         outerFont(distance(beg, par),
                                                   paragraphs()));
        }
 
        if (!undefined())
-               sgml::closeTag(os, getLayout().latexname);
+               sgml::closeTag(os, getLayout().latexname());
 
        return 0;
 }
 
 
-void InsetFlex::textString(Buffer const & buf, odocstream & os) const
+void InsetFlex::textString(odocstream & os) const
 {
-       os << paragraphs().begin()->asString(buf, true);
+       os << paragraphs().begin()->asString(true);
 }