X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBranch.h;h=c51c728e4f1610a4ce2a070a2cd11087f6240e78;hb=bfddee97e191a853f0576f4fab3f095c4e9ce0de;hp=0c42e8fbe6934c99b1a7708fa4149301bcbb0cba;hpb=5fdd2daa9c30c70a6c049376bd293addb05b5aad;p=lyx.git

diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h
index 0c42e8fbe6..c51c728e4f 100644
--- a/src/insets/InsetBranch.h
+++ b/src/insets/InsetBranch.h
@@ -14,7 +14,6 @@
 
 #include "InsetCollapsable.h"
 
-
 namespace lyx {
 
 class InsetBranchParams {
@@ -43,9 +42,7 @@ class InsetBranch : public InsetCollapsable
 {
 public:
 	///
-	InsetBranch(Buffer const &, InsetBranchParams const &);
-	///
-	~InsetBranch();
+	InsetBranch(Buffer *, InsetBranchParams const &);
 
 	///
 	static std::string params2string(InsetBranchParams const &);
@@ -57,8 +54,6 @@ public:
 	void rename(docstring const & newname) { params_.branch = newname; }
 
 private:
-	///
-	docstring editMessage() const;
 	///
 	InsetCode lyxCode() const { return BRANCH_CODE; }
 	///
@@ -68,31 +63,29 @@ private:
 	///
 	docstring const buttonLabel(BufferView const & bv) const;
 	///
-	ColorCode backgroundColor() const;
+	ColorCode backgroundColor(PainterInfo const &) const;
 	///
-	bool showInsetDialog(BufferView *) const;
-	///
-	int latex(odocstream &, OutputParams const &) const;
+	void latex(otexstream &, OutputParams const &) const;
 	///
 	int plaintext(odocstream &, OutputParams const &) const;
 	///
 	int docbook(odocstream &, OutputParams const &) const;
 	///
-	docstring xhtml(odocstream &, OutputParams const &) const;
+	docstring xhtml(XHTMLStream &, OutputParams const &) const;
+	///
+	void toString(odocstream &) const;
 	///
-	void tocString(odocstream &) const;
+	void forToc(docstring &, size_t) const;
 	///
 	void validate(LaTeXFeatures &) const;
 	///
-	docstring contextMenu(BufferView const &, int, int) const;
+	docstring contextMenuName() const;
 	///
-	void addToToc(DocIterator const &);
+	void addToToc(DocIterator const &) const;
 	///
 	InsetBranchParams const & params() const { return params_; }
 	///
 	void setParams(InsetBranchParams const & params) { params_ = params; }
-	///
-	virtual bool usePlainLayout() { return false; }
 
 	/** \returns true if params_.branch is listed as 'selected' in
 	    \c buffer. This handles the case of child documents.
@@ -116,7 +109,7 @@ private:
 	///
 	void doDispatch(Cursor & cur, FuncRequest & cmd);
 	///
-	docstring name() const { return from_ascii("Branch"); }
+	docstring layoutName() const { return from_ascii("Branch"); }
 	///
 	Inset * clone() const { return new InsetBranch(*this); }