following rev. 18724 boost/signal is not needed.

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

diff --git a/src/insets/InsetWrap.cpp b/src/insets/InsetWrap.cpp
index 7290a4bbc46331c6726cd76c179e3eb2de40747d..ee37625c873c168abd4f191675628c69d3a7101c 100644 (file)
--- a/src/insets/InsetWrap.cpp
+++ b/src/insets/InsetWrap.cpp
@@ -44,17 +44,16 @@ using std::ostringstream;
 
 
 InsetWrap::InsetWrap(BufferParams const & bp, string const & type)
-       : InsetCollapsable(bp)
+       : InsetCollapsable(bp), name_(from_utf8(type))
 {
        setLabel(_("wrap: ") + floatName(type, bp));
-       LyXFont font(LyXFont::ALL_SANE);
+       Font font(Font::ALL_SANE);
        font.decSize();
        font.decSize();
        font.setColor(Color::collapsable);
        setLabelFont(font);
        params_.type = type;
        params_.width = Length(50, Length::PCW);
-       setInsetName(from_utf8(type));
 }
 
 
@@ -167,9 +166,9 @@ void InsetWrap::validate(LaTeXFeatures & features) const
 }
 
 
-auto_ptr<InsetBase> InsetWrap::doClone() const
+auto_ptr<Inset> InsetWrap::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetWrap(*this));
+       return auto_ptr<Inset>(new InsetWrap(*this));
 }
 
 
@@ -180,7 +179,7 @@ docstring const InsetWrap::editMessage() const
 
 
 int InsetWrap::latex(Buffer const & buf, odocstream & os,
-                     OutputParams const & runparams) const
+                    OutputParams const & runparams) const
 {
        os << "\\begin{floating" << from_ascii(params_.type) << '}';
        if (!params_.placement.empty())
@@ -193,9 +192,9 @@ int InsetWrap::latex(Buffer const & buf, odocstream & os,
 
 
 int InsetWrap::plaintext(Buffer const & buf, odocstream & os,
-                         OutputParams const & runparams) const
+                        OutputParams const & runparams) const
 {
-       os << '[' << _("wrap") << ' ' << floatName(params_.type, buf.params()) << ":\n";
+       os << '[' << buf.B_("wrap") << ' ' << floatName(params_.type, buf.params()) << ":\n";
        InsetText::plaintext(buf, os, runparams);
        os << "\n]";
 
@@ -204,17 +203,17 @@ int InsetWrap::plaintext(Buffer const & buf, odocstream & os,
 
 
 int InsetWrap::docbook(Buffer const & buf, odocstream & os,
-                       OutputParams const & runparams) const
+                      OutputParams const & runparams) const
 {
-        // FIXME UNICODE
-        os << '<' << from_ascii(params_.type) << '>';
+       // FIXME UNICODE
+       os << '<' << from_ascii(params_.type) << '>';
        int const i = InsetText::docbook(buf, os, runparams);
        os << "</" << from_ascii(params_.type) << '>';
        return i;
 }
 
 
-bool InsetWrap::insetAllowed(InsetBase::Code code) const
+bool InsetWrap::insetAllowed(Inset::Code code) const
 {
        switch(code) {
        case FLOAT_CODE:
@@ -235,13 +234,6 @@ bool InsetWrap::showInsetDialog(BufferView * bv) const
 }
 
 
-void InsetWrap::addToToc(TocList & toclist, Buffer const & buf) const
-{
-       // Is there a need to provide a list of wrap insets?
-       return;
-}
-
-
 string const InsetWrapMailer::name_("wrap");
 
 InsetWrapMailer::InsetWrapMailer(InsetWrap & inset)
@@ -271,7 +263,7 @@ void InsetWrapMailer::string2params(string const & in, InsetWrapParams & params)
                return print_mailer_error("InsetWrapMailer", in, 1, name_);
 
        // This is part of the inset proper that is usually swallowed
-       // by LyXText::readInset
+       // by Text::readInset
        string id;
        lex >> id;
        if (!lex || id != "Wrap")