cleanup after svn hang-up, #undef CursorShape. Should be compilable ganin now.

[lyx.git] / src / BranchList.h

diff --git a/src/BranchList.h b/src/BranchList.h
index 184e3f3cf8ca7389df12fb8fe65573cb5aa86f0b..c0b18b57a0ebf5e2056dfbef2266f437d9c6824e 100644 (file)
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -30,12 +30,16 @@
 #ifndef BRANCHES_H
 #define BRANCHES_H
 
+#include "Color.h"
+
 #include <string>
 #include <list>
 
 
 class Branch {
 public:
+       ///
+       Branch();
        ///
        std::string const & getBranch() const;
        ///
@@ -47,8 +51,15 @@ public:
         */
        bool setSelected(bool);
        ///
-       std::string const & getColor() const;
+       lyx::RGBColor const & getColor() const;
        ///
+       void setColor(lyx::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 &);
 
 
@@ -58,7 +69,7 @@ private:
        ///
        bool selected_;
        ///
-       std::string color_;
+       lyx::RGBColor color_;
 };
 
 
@@ -72,7 +83,7 @@ public:
        BranchList() : separator_("|") {}
 
        ///
-       bool empty() { return list.empty(); }
+       bool empty() const { return list.empty(); }
        ///
        void clear() { list.clear(); }
        ///