* src/inset/InsetNomencl.cpp:

[lyx.git] / src / BranchList.cpp

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 8eb585d717541257932fc840c8fee522114396fa..8967fab12f52ca2c2f4cc7c8335c1fadffef284d 100644 (file)
--- a/src/BranchList.cpp
+++ b/src/BranchList.cpp
@@ -17,14 +17,30 @@
 
 #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.getBranch() == name_;
+       }
+private:
+       docstring name_;
+};
+}
+
 
 Branch::Branch() : selected_(false)
 {
-       theApp()->getRgbColor(Color::background, color_);
+       // no theApp() with command line export
+       if (theApp())
+               theApp()->getRgbColor(Color_background, color_);
 }
 
 
@@ -67,20 +83,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 +104,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;
 }
 
@@ -106,7 +122,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;