Remove color dependency of framed note, fix bug 3598

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

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 8738bae0fd1b81c3f96febb467720597190f0c7f..2ca92f23cd23b7d4b95779affd1b0bb8cec53aec 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -64,9 +64,9 @@ InsetBranch::~InsetBranch()
 }
 
 
-auto_ptr<InsetBase> InsetBranch::doClone() const
+auto_ptr<Inset> InsetBranch::doClone() const
 {
-       return auto_ptr<InsetBase>(new InsetBranch(*this));
+       return auto_ptr<Inset>(new InsetBranch(*this));
 }
 
 
@@ -93,7 +93,7 @@ void InsetBranch::read(Buffer const & buf, Lexer & lex)
 
 void InsetBranch::setButtonLabel()
 {
-       LyXFont font(LyXFont::ALL_SANE);
+       Font font(Font::ALL_SANE);
        font.decSize();
        font.decSize();
 
@@ -235,7 +235,7 @@ int InsetBranch::plaintext(Buffer const & buf, odocstream & os,
        if (!isBranchSelected(buf))
                return 0;
 
-       os << '[' << _("branch") << ' ' << params_.branch << ":\n";
+       os << '[' << buf.B_("branch") << ' ' << params_.branch << ":\n";
        InsetText::plaintext(buf, os, runparams);
        os << "\n]";
 
@@ -304,7 +304,7 @@ void InsetBranchMailer::string2params(string const & in,
                return print_mailer_error("InsetBranchMailer", 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 != "Branch")