InsetListings: change the interface of diaplay function and allow AlignLeft. Applied...

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

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 61c7411b6e1a83d6509d0af4aa55bd51bae0a27c..deda6e189c031aa8c2be6b842b4158047844af11 100644 (file)
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -119,7 +119,7 @@ InsetFloat::InsetFloat(BufferParams const & bp, string const & type)
        : InsetCollapsable(bp), name_(from_utf8(type))
 {
        setLabel(_("float: ") + floatName(type, bp));
-       LyXFont font(LyXFont::ALL_SANE);
+       Font font(Font::ALL_SANE);
        font.decSize();
        font.decSize();
        font.setColor(Color::collapsable);
@@ -266,9 +266,9 @@ void InsetFloat::validate(LaTeXFeatures & features) const
 }
 
 
-auto_ptr<InsetBase> InsetFloat::doClone() const
+auto_ptr<Inset> InsetFloat::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetFloat(*this));
+       return auto_ptr<Inset>(new InsetFloat(*this));
 }
 
 
@@ -281,7 +281,7 @@ docstring const InsetFloat::editMessage() const
 int InsetFloat::latex(Buffer const & buf, odocstream & os,
                       OutputParams const & runparams) const
 {
-       FloatList const & floats = buf.params().getLyXTextClass().floats();
+       FloatList const & floats = buf.params().getTextClass().floats();
        string tmptype = (params_.wide ? params_.type + "*" : params_.type);
        if (params_.sideways) {
                if (params_.type == "table")
@@ -330,7 +330,7 @@ int InsetFloat::latex(Buffer const & buf, odocstream & os,
 int InsetFloat::plaintext(Buffer const & buf, odocstream & os,
                           OutputParams const & runparams) const
 {
-       os << '[' << _("float") << ' ' << floatName(params_.type, buf.params()) << ":\n";
+       os << '[' << buf.B_("float") << ' ' << floatName(params_.type, buf.params()) << ":\n";
        InsetText::plaintext(buf, os, runparams);
        os << "\n]";
 
@@ -350,11 +350,11 @@ int InsetFloat::docbook(Buffer const & buf, odocstream & os,
 }
 
 
-bool InsetFloat::insetAllowed(InsetBase::Code code) const
+bool InsetFloat::insetAllowed(Inset::Code code) const
 {
-       return code != InsetBase::FLOAT_CODE
-           && code != InsetBase::FOOT_CODE
-           && code != InsetBase::MARGIN_CODE;
+       return code != Inset::FLOAT_CODE
+           && code != Inset::FOOT_CODE
+           && code != Inset::MARGIN_CODE;
 }
 
 
@@ -441,7 +441,7 @@ void InsetFloatMailer::string2params(string const & in,
                return print_mailer_error("InsetFloatMailer", 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 != "Float")