X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBranchList.h;h=68cc46cebc8bad7715993f5ba9304c825438d2ae;hb=09df753df4c24470617c64d25eae6df2db85dfed;hp=77b8d2be93c768b4d064fe105fa7ded1cb6e3ea4;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git

diff --git a/src/BranchList.h b/src/BranchList.h
index 77b8d2be93..68cc46cebc 100644
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -30,9 +30,10 @@
 #ifndef BRANCHES_H
 #define BRANCHES_H
 
-#include "Color.h"
+#include "ColorCode.h"
+
+#include "support/docstring.h"
 
-#include <string>
 #include <list>
 
 
@@ -44,9 +45,9 @@ public:
 	///
 	Branch();
 	///
-	std::string const & getBranch() const;
+	docstring const & getBranch() const;
 	///
-	void setBranch(std::string const &);
+	void setBranch(docstring const &);
 	///
 	bool getSelected() const;
 	/** Select/deselect the branch.
@@ -59,15 +60,15 @@ public:
 	void setColor(RGBColor const &);
 	/**
 	 * Set color from a string "#rrggbb".
-	 * Use LColor:background if the string is no valid color.
+	 * Use Color: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.
+	 * color "none" that was displayed as Color:background.
 	 */
 	void setColor(std::string const &);
 
 private:
 	///
-	std::string branch_;
+	docstring branch_;
 	///
 	bool selected_;
 	///
@@ -82,7 +83,7 @@ public:
 	typedef List::const_iterator const_iterator;
 
 	///
-	BranchList() : separator_("|") {}
+	BranchList() : separator_(from_ascii("|")) {}
 
 	///
 	bool empty() const { return list.empty(); }
@@ -94,36 +95,36 @@ public:
 
 	/** \returns the Branch with \c name. If not found, returns 0.
 	 */
-	Branch * find(std::string const & name);
-	Branch const * find(std::string const & name) const;
+	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(std::string const &);
+	bool add(docstring const &);
 	/** remove a branch from list by name
 	 *  \returns true if a branch is removed.
 	 */
-	bool remove(std::string const &);
+	bool remove(docstring const &);
 
 private:
 	///
 	List list;
 	///
-	std::string separator_;
+	docstring separator_;
 };
 
 
 class BranchNamesEqual : public std::unary_function<Branch, bool> {
 public:
-	BranchNamesEqual(std::string const & name)
+	BranchNamesEqual(docstring const & name)
 		: name_(name) {}
 	bool operator()(Branch const & branch) const
 	{
 		return branch.getBranch() == name_;
 	}
 private:
-	std::string name_;
+	docstring name_;
 };