X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBranchList.cpp;h=a593c5478fc91e9b421537f6cc849b32b2590238;hb=70a24259f8e3eb75677178ef5e28ecbb51c2935b;hp=5b78d71c3c453293ebae2d1bf37ed191b284f251;hpb=ada0bd00f07c85235c6653a0f7ecb04a8c28b54d;p=lyx.git

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 5b78d71c3c..a593c5478f 100644
--- a/src/BranchList.cpp
+++ b/src/BranchList.cpp
@@ -17,18 +17,37 @@
 
 #include <algorithm>
 
-using std::string;
+using namespace std;
+
 
 namespace lyx {
 
+namespace {
+
+class BranchNamesEqual : public std::unary_function<Branch, bool>
+{
+public:
+	BranchNamesEqual(docstring const & name) : name_(name) {}
+
+	bool operator()(Branch const & branch) const
+	{
+		return branch.branch() == name_;
+	}
+private:
+	docstring name_;
+};
+}
+
 
-Branch::Branch()
+Branch::Branch() : selected_(false)
 {
-	theApp()->getRgbColor(Color::background, color_);
+	// no theApp() with command line export
+	if (theApp())
+		theApp()->getRgbColor(Color_background, color_);
 }
 
 
-docstring const & Branch::getBranch() const
+docstring const & Branch::branch() const
 {
 	return branch_;
 }
@@ -40,7 +59,7 @@ void Branch::setBranch(docstring const & s)
 }
 
 
-bool Branch::getSelected() const
+bool Branch::isSelected() const
 {
 	return selected_;
 }
@@ -55,7 +74,7 @@ bool Branch::setSelected(bool b)
 }
 
 
-RGBColor const & Branch::getColor() const
+RGBColor const & Branch::color() const
 {
 	return color_;
 }
@@ -67,20 +86,20 @@ void Branch::setColor(RGBColor const & c)
 }
 
 
-void Branch::setColor(string const & c)
+void Branch::setColor(string const & str)
 {
-	if (c.size() == 7 && c[0] == '#')
-		color_ = RGBColor(c);
+	if (str.size() == 7 && str[0] == '#')
+		color_ = rgbFromHexName(str);
 	else
 		// no color set or invalid color - use normal background
-		theApp()->getRgbColor(Color::background, color_);
+		theApp()->getRgbColor(Color_background, color_);
 }
 
 
 Branch * BranchList::find(docstring const & name)
 {
 	List::iterator it =
-		std::find_if(list.begin(), list.end(), BranchNamesEqual(name));
+		find_if(list.begin(), list.end(), BranchNamesEqual(name));
 	return it == list.end() ? 0 : &*it;
 }
 
@@ -88,7 +107,7 @@ Branch * BranchList::find(docstring const & name)
 Branch const * BranchList::find(docstring const & name) const
 {
 	List::const_iterator it =
-		std::find_if(list.begin(), list.end(), BranchNamesEqual(name));
+		find_if(list.begin(), list.end(), BranchNamesEqual(name));
 	return it == list.end() ? 0 : &*it;
 }
 
@@ -96,9 +115,9 @@ Branch const * BranchList::find(docstring const & name) const
 bool BranchList::add(docstring const & s)
 {
 	bool added = false;
-	docstring::size_type i = 0;
+	size_t i = 0;
 	while (true) {
-		docstring::size_type const j = s.find_first_of(separator_, i);
+		size_t const j = s.find_first_of(separator_, i);
 		docstring name;
 		if (j == docstring::npos)
 			name = s.substr(i);
@@ -106,7 +125,7 @@ bool BranchList::add(docstring const & s)
 			name = s.substr(i, j - i);
 		// Is this name already in the list?
 		bool const already =
-			std::find_if(list.begin(), list.end(),
+			find_if(list.begin(), list.end(),
 				     BranchNamesEqual(name)) != list.end();
 		if (!already) {
 			added = true;