X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBranch.h;h=391f2475f06765971a9d4d69afb324b5bef05943;hb=22e6659780390a19174d1bf896317a5baf9e40d7;hp=beca1c683bee7b42dd5acffdefe1dcb4a2b1c4d2;hpb=5df323a0dd564f00c5ab085a3570957ad76b21d3;p=lyx.git

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index beca1c683b..391f2475f0 100644
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -12,7 +12,7 @@
 #ifndef INSETBRANCH_H
 #define INSETBRANCH_H
 
-#include "InsetCollapsable.h"
+#include "InsetCollapsible.h"
 
 namespace lyx {
 
@@ -42,7 +42,7 @@ public:
 
 /// The Branch inset for alternative, conditional output.
 
-class InsetBranch : public InsetCollapsable
+class InsetBranch : public InsetCollapsible
 {
 public:
 	///
@@ -88,8 +88,7 @@ private:
 	///
 	std::string contextMenuName() const;
 	///
-	void addToToc(DocIterator const & di, bool output_active,
-				  UpdateType utype) const;
+	void updateBuffer(ParIterator const & it, UpdateType utype);
 	///
 	void setParams(InsetBranchParams const & params) { params_ = params; }
 
@@ -97,17 +96,13 @@ private:
 		\c buffer. \p child only checks within child documents.
 	 */
 	bool isBranchSelected(bool const child = false) const;
-	///
-	bool isBranchActive(bool const child = false) const
-		// XOR
-		{ return isBranchSelected(child) != params_.inverted; }
 	/*!
 	 * Is the content of this inset part of the output document?
 	 *
-	 * Note that Branch insets are only considered part of the
-	 * document when they are selected.
+	 * Note that Branch insets are considered part of the
+	 * document when they are selected XOR inverted.
 	 */
-	bool producesOutput() const { return isBranchSelected(); }
+	bool producesOutput() const;
 	///
 	bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
 	///