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

diff --git a/src/insets/insetbranch.h b/src/insets/insetbranch.h
index 6da8766643..f39fe12707 100644
--- a/src/insets/insetbranch.h
+++ b/src/insets/insetbranch.h
@@ -12,20 +12,25 @@
 #ifndef INSETBRANCH_H
 #define INSETBRANCH_H
 
-
 #include "insetcollapsable.h"
-#include "BranchList.h"
+#include "mailinset.h"
+
+
+namespace lyx {
+
+class Buffer;
 
- struct InsetBranchParams {
+class InsetBranchParams {
+public:
+	explicit InsetBranchParams(docstring const & b = docstring())
+		: branch(b) {}
 	///
 	void write(std::ostream & os) const;
 	///
 	void read(LyXLex & lex);
 	///
-	std::string branch;
-	/// Hack -- MV
-	BranchList branchlist;
- };
+	docstring branch;
+};
 
 
 /** The Branch inset for alternative, conditional output.
@@ -34,17 +39,13 @@
 class InsetBranch : public InsetCollapsable {
 public:
 	///
-	InsetBranch(BufferParams const &, std::string const &);
-	/// Copy constructor
-	InsetBranch(InsetBranch const &);
+	InsetBranch(BufferParams const &, InsetBranchParams const &);
 	///
 	~InsetBranch();
 	///
-	virtual std::auto_ptr<InsetBase> clone() const;
+	virtual docstring const editMessage() const;
 	///
-	std::string const editMessage() const;
-	///
-	InsetOld::Code lyxCode() const { return InsetOld::BRANCH_CODE; }
+	InsetBase::Code lyxCode() const { return InsetBase::BRANCH_CODE; }
 	///
 	void write(Buffer const &, std::ostream &) const;
 	///
@@ -54,38 +55,43 @@ 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_; }
 	///
 	void setParams(InsetBranchParams const & params) { params_ = params; }
-protected:
+
+	/** \returns true if params_.branch is listed as 'selected' in
+	    \c buffer. This handles the case of child documents.
+	 */
+	bool isBranchSelected(Buffer const & buffer) const;
 	///
-	virtual
-	DispatchResult
-	priv_dispatch(FuncRequest const &, idx_type &, pos_type &);
+	bool getStatus(LCursor &, FuncRequest const &, FuncStatus &) const;
+
+protected:
+	InsetBranch(InsetBranch const &);
+	virtual void doDispatch(LCursor & cur, FuncRequest & cmd);
 private:
 	friend class InsetBranchParams;
 
+	virtual std::auto_ptr<InsetBase> doClone() const;
+
 	/// used by the constructors
 	void init();
 	///
 	InsetBranchParams params_;
 };
 
-#include "mailinset.h"
 
 class InsetBranchMailer : public MailInset {
 public:
@@ -109,6 +115,6 @@ private:
 	InsetBranch & inset_;
 };
 
-
+} // namespace lyx
 
 #endif