X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBranchList.h;h=dd89a261d765e601e26d42c6e0c317a38766dc76;hb=0657a91fd08e9c31d7f9e6be26055cc5050e5f8b;hp=aaa5f15ecd548c5a8cc3bc2276a728d2b1b5cc6c;hpb=44cd0fc9a1687cc63911c7f98d978594458e7813;p=lyx.git

diff --git a/src/BranchList.h b/src/BranchList.h
index aaa5f15ecd..dd89a261d7 100644
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -30,78 +30,104 @@
 #ifndef BRANCHES_H
 #define BRANCHES_H
 
-#include <string>
+#include "Color.h"
+
+#include "support/docstring.h"
+
 #include <list>
 
 
+namespace lyx {
+
+
 class Branch {
 public:
 	///
-	std::string const getBranch() const;
-	///
-	void setBranch(std::string const &);
-	///
-	bool getSelected() const;
+	Branch();
 	///
-	void setSelected(bool);
+	docstring const & getBranch() const;
 	///
-	std::string const getColor() const;
+	void setBranch(docstring const &);
 	///
+	bool getSelected() const;
+	/** Select/deselect the branch.
+	 *  \return true if the selection status changes.
+	 */
+	bool setSelected(bool);
+	///
+	RGBColor const & getColor() const;
+	///
+	void setColor(RGBColor const &);
+	/**
+	 * Set color from a string "#rrggbb".
+	 * Use LColor:background if the string is no valid color.
+	 * This ensures compatibility with LyX 1.4.0 that had the symbolic
+	 * color "none" that was displayed as LColor:background.
+	 */
 	void setColor(std::string const &);
 
-
 private:
 	///
-	std::string branch_;
+	docstring branch_;
 	///
 	bool selected_;
 	///
-	std::string color_;
+	RGBColor color_;
 };
 
 
 class BranchList {
-public:
-	///
-	BranchList() : separator_("|") {}
-
 	///
 	typedef std::list<Branch> List;
+public:
+	typedef List::const_iterator const_iterator;
 
 	///
-	void clear();
-	///
-	bool empty() { return list.empty(); }
-	///
-	bool size() const { return list.size(); }
-	///
-	List::const_iterator begin() const { return list.begin(); }
-	///
-	List::const_iterator end() const { return list.end(); }
-	///
-	std::string getColor(std::string const &) const;
+	BranchList() : separator_(from_ascii("|")) {}
+
 	///
-	void setColor(std::string const &, std::string const &);
-	/// Select/deselect multiple branches given in '|'-separated string
-	void setSelected(std::string const &, bool);
-	/// Add multiple branches to list
-	void add(std::string const &);
-	/// remove a branch from list by name
-	void remove(std::string const &);
-	/// return whether this branch is selected
-	bool selected(std::string const &) const;
-	/// return, as a '|'-separated string, all branch names
-	std::string allBranches() const;
+	bool empty() const { return list.empty(); }
 	///
-	std::string allSelected() const;
+	void clear() { list.clear(); }
 	///
-	std::string const separator() const;
+	const_iterator begin() const { return list.begin(); }
+	const_iterator end() const { return list.end(); }
+
+	/** \returns the Branch with \c name. If not found, returns 0.
+	 */
+	Branch * find(docstring const & name);
+	Branch const * find(docstring const & name) const;
+
+	/** Add (possibly multiple (separated by separator())) branches to list
+	 *  \returns true if a branch is added.
+	 */
+	bool add(docstring const &);
+	/** remove a branch from list by name
+	 *  \returns true if a branch is removed.
+	 */
+	bool remove(docstring const &);
 
 private:
 	///
 	List list;
 	///
-	std::string separator_;
+	docstring separator_;
 };
 
+
+class BranchNamesEqual : public std::unary_function<Branch, bool> {
+public:
+	BranchNamesEqual(docstring const & name)
+		: name_(name) {}
+	bool operator()(Branch const & branch) const
+	{
+		return branch.getBranch() == name_;
+	}
+private:
+	docstring name_;
+};
+
+
+} // namespace lyx
+
 #endif