Fix GRAPHICS_EDIT of InsetGraphics

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

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 67b4adcd3934d682a894f0731bea510df63477e6..852b04fc0cee4e993a3196ec898db45527bc88a5 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -33,14 +33,8 @@ using namespace std;
 namespace lyx {
 
 
-InsetBranch::InsetBranch(BufferParams const & bp,
-                        InsetBranchParams const & params)
-       : InsetCollapsable(bp), params_(params)
-{}
-
-
-InsetBranch::InsetBranch(InsetBranch const & in)
-       : InsetCollapsable(in), params_(in.params_)
+InsetBranch::InsetBranch(Buffer const & buf, InsetBranchParams const & params)
+       : InsetCollapsable(buf), params_(params)
 {}
 
 
@@ -50,33 +44,27 @@ InsetBranch::~InsetBranch()
 }
 
 
-Inset * InsetBranch::clone() const
-{
-       return new InsetBranch(*this);
-}
-
-
-docstring const InsetBranch::editMessage() const
+docstring InsetBranch::editMessage() const
 {
        return _("Opened Branch Inset");
 }
 
 
-void InsetBranch::write(Buffer const & buf, ostream & os) const
+void InsetBranch::write(ostream & os) const
 {
        params_.write(os);
-       InsetCollapsable::write(buf, os);
+       InsetCollapsable::write(os);
 }
 
 
-void InsetBranch::read(Buffer const & buf, Lexer & lex)
+void InsetBranch::read(Lexer & lex)
 {
        params_.read(lex);
-       InsetCollapsable::read(buf, lex);
+       InsetCollapsable::read(lex);
 }
 
 
-docstring InsetBranch::toolTip(BufferView const & bv, int x, int y) const
+docstring InsetBranch::toolTip(BufferView const &, int, int) const
 {
        return _("Branch: ") + params_.branch;
 }
@@ -153,7 +141,7 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_INSET_TOGGLE:
                if (cmd.argument() == "assign") {
                        // The branch inset uses "assign".
-                       if (isBranchSelected(cur.buffer())) {
+                       if (isBranchSelected()) {
                                if (status() != Open)
                                        setStatus(cur, Open);
                                else
@@ -189,9 +177,8 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
                if (cmd.argument() == "open" || cmd.argument() == "close" ||
                    cmd.argument() == "toggle")
                        flag.enabled(true);
-               else if (cmd.argument() == "assign"
-                          || cmd.argument().empty()) {
-                       if (isBranchSelected(cur.buffer()))
+               else if (cmd.argument() == "assign" || cmd.argument().empty()) {
+                       if (isBranchSelected())
                                flag.enabled(status() != Open);
                        else
                                flag.enabled(status() != Collapsed);
@@ -206,9 +193,9 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-bool InsetBranch::isBranchSelected(Buffer const & buffer) const
+bool InsetBranch::isBranchSelected() const
 {
-       Buffer const & realbuffer = *buffer.masterBuffer();
+       Buffer const & realbuffer = *buffer().masterBuffer();
        BranchList const & branchlist = realbuffer.params().branchlist();
        BranchList::const_iterator const end = branchlist.end();
        BranchList::const_iterator it =
@@ -220,53 +207,50 @@ bool InsetBranch::isBranchSelected(Buffer const & buffer) const
 }
 
 
-void InsetBranch::updateLabels(Buffer const & buf, ParIterator const & it)
+void InsetBranch::updateLabels(ParIterator const & it)
 {
-       if (isBranchSelected(buf))
-               InsetCollapsable::updateLabels(buf, it);
+       if (isBranchSelected())
+               InsetCollapsable::updateLabels(it);
        else {
-               TextClass const & tclass = buf.params().getTextClass();
+               DocumentClass const & tclass = buffer().params().documentClass();
                Counters savecnt = tclass.counters();
-               InsetCollapsable::updateLabels(buf, it);
+               InsetCollapsable::updateLabels(it);
                tclass.counters() = savecnt;
        }
 }
 
 
-int InsetBranch::latex(Buffer const & buf, odocstream & os,
-                      OutputParams const & runparams) const
+int InsetBranch::latex(odocstream & os, OutputParams const & runparams) const
 {
-       return isBranchSelected(buf) ?
-               InsetText::latex(buf, os, runparams) : 0;
+       return isBranchSelected() ?  InsetText::latex(os, runparams) : 0;
 }
 
 
-int InsetBranch::plaintext(Buffer const & buf, odocstream & os,
+int InsetBranch::plaintext(odocstream & os,
                           OutputParams const & runparams) const
 {
-       if (!isBranchSelected(buf))
+       if (!isBranchSelected())
                return 0;
 
-       os << '[' << buf.B_("branch") << ' ' << params_.branch << ":\n";
-       InsetText::plaintext(buf, os, runparams);
+       os << '[' << buffer().B_("branch") << ' ' << params_.branch << ":\n";
+       InsetText::plaintext(os, runparams);
        os << "\n]";
 
        return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
-int InsetBranch::docbook(Buffer const & buf, odocstream & os,
+int InsetBranch::docbook(odocstream & os,
                         OutputParams const & runparams) const
 {
-       return isBranchSelected(buf) ?
-               InsetText::docbook(buf, os, runparams) : 0;
+       return isBranchSelected() ?  InsetText::docbook(os, runparams) : 0;
 }
 
 
-void InsetBranch::textString(Buffer const & buf, odocstream & os) const
+void InsetBranch::textString(odocstream & os) const
 {
-       if (isBranchSelected(buf))
-               os << paragraphs().begin()->asString(buf, true);
+       if (isBranchSelected())
+               os << paragraphs().begin()->asString(true);
 }
 
 
@@ -276,10 +260,10 @@ void InsetBranch::validate(LaTeXFeatures & features) const
 }
 
 
-bool InsetBranch::isMacroScope(Buffer const & buf) const 
+bool InsetBranch::isMacroScope() const 
 {
        // Its own scope if not selected by buffer
-       return !isBranchSelected(buf);
+       return !isBranchSelected();
 }