X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbranch.h;h=f39fe12707c25f5bcca7a09847972ae5fd1a7bc8;hb=e28331ed63062dea10d0a21b9ec12034b4b17b9a;hp=dae9a5bf8d99e788543b882cb80d4962b2ff7c71;hpb=323cafa18c2315759087d976e800aebd894fb40f;p=lyx.git

diff --git a/src/insets/insetbranch.h b/src/insets/insetbranch.h
index dae9a5bf8d..f39fe12707 100644
--- a/src/insets/insetbranch.h
+++ b/src/insets/insetbranch.h
@@ -12,22 +12,24 @@
 #ifndef INSETBRANCH_H
 #define INSETBRANCH_H
 
-
 #include "insetcollapsable.h"
+#include "mailinset.h"
 
-class BranchList;
 
+namespace lyx {
+
+class Buffer;
 
 class InsetBranchParams {
 public:
-	explicit InsetBranchParams(std::string const & b = std::string())
+	explicit InsetBranchParams(docstring const & b = docstring())
 		: branch(b) {}
 	///
 	void write(std::ostream & os) const;
 	///
 	void read(LyXLex & lex);
 	///
-	std::string branch;
+	docstring branch;
 };
 
 
@@ -41,7 +43,7 @@ public:
 	///
 	~InsetBranch();
 	///
-	std::string const editMessage() const;
+	virtual docstring const editMessage() const;
 	///
 	InsetBase::Code lyxCode() const { return InsetBase::BRANCH_CODE; }
 	///
@@ -53,18 +55,16 @@ public:
 	///
 	bool showInsetDialog(BufferView *) const;
 	///
-	int latex(Buffer const &, std::ostream &,
-			OutputParams const &) const;
-	///
-	int linuxdoc(Buffer const &, std::ostream &,
-		     OutputParams const &) const;
+	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int docbook(Buffer const &, std::ostream &,
+	int docbook(Buffer const &, odocstream &,
 		    OutputParams const & runparams) const;
 	///
-	int plaintext(Buffer const &, std::ostream &,
+	int plaintext(Buffer const &, odocstream &,
 		  OutputParams const & runparams) const;
 	///
+	void textString(Buffer const & buf, odocstream &) const;
+	///
 	void validate(LaTeXFeatures &) const;
 	///
 	InsetBranchParams const & params() const { return params_; }
@@ -72,9 +72,9 @@ public:
 	void setParams(InsetBranchParams const & params) { params_ = params; }
 
 	/** \returns true if params_.branch is listed as 'selected' in
-	    \c branchlist.
+	    \c buffer. This handles the case of child documents.
 	 */
-	bool isBranchSelected(BranchList const & branchlist) const;
+	bool isBranchSelected(Buffer const & buffer) const;
 	///
 	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
 
@@ -92,7 +92,6 @@ private:
 	InsetBranchParams params_;
 };
 
-#include "mailinset.h"
 
 class InsetBranchMailer : public MailInset {
 public:
@@ -116,6 +115,6 @@ private:
 	InsetBranch & inset_;
 };
 
-
+} // namespace lyx
 
 #endif