Added Liviu Andronic, and modified generate_contributions.py to match what was in...

[lyx.git] / src / BranchList.h

diff --git a/src/BranchList.h b/src/BranchList.h
index 3f2978acee0d96b31b245a54f57b6f5ef5a5f819..00814ab95722e2aa3258bfd257a10d339f19f689 100644 (file)
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -30,7 +30,7 @@
 #ifndef BRANCHES_H
 #define BRANCHES_H
 
-#include "color.h"
+#include "ColorCode.h"
 
 #include "support/docstring.h"
 
@@ -60,9 +60,9 @@ 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 &);
 
@@ -115,17 +115,6 @@ private:
 };
 
 
-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