X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBranch.cpp;h=77af2829e1a70421e319ea01bcbc03068aad03d5;hb=cf6ff2cac79d09adafa63e3a1ec02dfb09f707b9;hp=e22555ba79fbc911ba754e1eb008af3cc52a3eff;hpb=5018e1077b57738cca8daf84f104e5285c87a5eb;p=lyx.git

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index e22555ba79..77af2829e1 100644
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -44,7 +44,7 @@ using namespace std;
 namespace lyx {
 
 InsetBranch::InsetBranch(Buffer * buf, InsetBranchParams const & params)
-	: InsetCollapsable(buf, InsetText::DefaultLayout), params_(params)
+	: InsetCollapsible(buf, InsetText::DefaultLayout), params_(params)
 {}
 
 
@@ -53,14 +53,14 @@ void InsetBranch::write(ostream & os) const
 	os << "Branch ";
 	params_.write(os);
 	os << '\n';
-	InsetCollapsable::write(os);
+	InsetCollapsible::write(os);
 }
 
 
 void InsetBranch::read(Lexer & lex)
 {
 	params_.read(lex);
-	InsetCollapsable::read(lex);
+	InsetCollapsible::read(lex);
 }
 
 
@@ -85,7 +85,7 @@ docstring InsetBranch::toolTip(BufferView const & bv, int, int) const
 		support::bformat(_("master %1$s, child %2$s"),
 						 masteron, childon);
 
-	docstring const heading = 
+	docstring const heading =
 		support::bformat(_("Branch Name: %1$s\nBranch Status: %2$s\nInset Status: %3$s"),
 						 params_.branch, status, onoff);
 
@@ -207,11 +207,11 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
 		if (cmd.argument() == "assign")
 			setStatus(cur, isBranchSelected() ? Open : Collapsed);
 		else
-			InsetCollapsable::doDispatch(cur, cmd);
+			InsetCollapsible::doDispatch(cur, cmd);
 		break;
 
 	default:
-		InsetCollapsable::doDispatch(cur, cmd);
+		InsetCollapsible::doDispatch(cur, cmd);
 		break;
 	}
 }
@@ -259,11 +259,11 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
 		if (cmd.argument() == "assign")
 			flag.setEnabled(true);
 		else
-			return InsetCollapsable::getStatus(cur, cmd, flag);	
+			return InsetCollapsible::getStatus(cur, cmd, flag);
 		break;
 
 	default:
-		return InsetCollapsable::getStatus(cur, cmd, flag);
+		return InsetCollapsible::getStatus(cur, cmd, flag);
 	}
 	return true;
 }
@@ -331,7 +331,7 @@ docstring InsetBranch::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 void InsetBranch::toString(odocstream & os) const
 {
 	if (producesOutput())
-		InsetCollapsable::toString(os);
+		InsetCollapsible::toString(os);
 }
 
 
@@ -339,14 +339,14 @@ void InsetBranch::forOutliner(docstring & os, size_t const maxlen,
 							  bool const shorten) const
 {
 	if (producesOutput())
-		InsetCollapsable::forOutliner(os, maxlen, shorten);
+		InsetCollapsible::forOutliner(os, maxlen, shorten);
 }
 
 
 void InsetBranch::validate(LaTeXFeatures & features) const
 {
 	if (producesOutput())
-		InsetCollapsable::validate(features);
+		InsetCollapsible::validate(features);
 }
 
 
@@ -356,7 +356,7 @@ string InsetBranch::contextMenuName() const
 }
 
 
-bool InsetBranch::isMacroScope() const 
+bool InsetBranch::isMacroScope() const
 {
 	// Its own scope if not selected by buffer
 	return !producesOutput();
@@ -385,30 +385,18 @@ void InsetBranch::string2params(string const & in, InsetBranchParams & params)
 }
 
 
-void InsetBranch::addToToc(DocIterator const & cpit, bool output_active,
-						   UpdateType utype) const
+void InsetBranch::updateBuffer(ParIterator const & it, UpdateType utype)
 {
-	DocIterator pit = cpit;
-	pit.push_back(CursorSlice(const_cast<InsetBranch &>(*this)));
-
-	docstring str;
-	text().forOutliner(str, TOC_ENTRY_LENGTH);
-	str = params_.branch + (params_.inverted ? " (-):" : ": ") + str;
-
-	shared_ptr<Toc> toc = buffer().tocBackend().toc("branch");
-	toc->push_back(TocItem(pit, 0, str, output_active));
-
-	// Proceed with the rest of the inset.
-	bool const doing_output = output_active && producesOutput();
-	InsetCollapsable::addToToc(cpit, doing_output, utype);
+	setLabel(params_.branch + (params_.inverted ? " (-)" : ""));
+	InsetCollapsible::updateBuffer(it, utype);
 }
 
 
 void InsetBranchParams::write(ostream & os) const
 {
-	os << to_utf8(branch) 
-	   << '\n' 
-	   << "inverted " 
+	os << to_utf8(branch)
+	   << '\n'
+	   << "inverted "
 	   << inverted;
 }