Fix bug #4510: GuiInclude->Edit marks master as changed.

[lyx.git] / src / BranchList.h

diff --git a/src/BranchList.h b/src/BranchList.h
index 893d8f9b6352657d2268928b44554462c91b5aea..ce21d48e2866bdc1751f019ba26792ddad0797cb 100644 (file)
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -27,38 +27,51 @@
  */
 
 
-#ifndef BRANCHES_H
-#define BRANCHES_H
+#ifndef BRANCHLIST_H
+#define BRANCHLIST_H
+
+#include "ColorCode.h"
+
+#include "support/docstring.h"
 
-#include <string>
 #include <list>
 
 
+namespace lyx {
+
 class Branch {
 public:
        ///
-       std::string const & getBranch() const;
+       Branch();
+       ///
+       docstring const & branch() const;
        ///
-       void setBranch(std::string const &);
+       void setBranch(docstring const &);
        ///
-       bool getSelected() const;
+       bool isSelected() const;
        /** Select/deselect the branch.
         *  \return true if the selection status changes.
         */
        bool setSelected(bool);
        ///
-       std::string const & getColor() const;
+       RGBColor const & color() const;
        ///
+       void setColor(RGBColor const &);
+       /**
+        * Set color from a string "#rrggbb".
+        * 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 Color:background.
+        */
        void setColor(std::string const &);
 
-
 private:
        ///
-       std::string branch_;
+       docstring branch_;
        ///
        bool selected_;
        ///
-       std::string color_;
+       RGBColor color_;
 };
 
 
@@ -69,33 +82,37 @@ public:
        typedef List::const_iterator const_iterator;
 
        ///
-       BranchList() : separator_("|") {}
+       BranchList() : separator_(from_ascii("|")) {}
 
        ///
-       bool empty() { return list.empty(); }
+       bool empty() const { return list.empty(); }
+       ///
+       void clear() { list.clear(); }
        ///
        const_iterator begin() const { return list.begin(); }
        const_iterator end() const { return list.end(); }
 
        /** \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_;
 };
 
-#endif
+} // namespace lyx
+
+#endif // BRANCHLIST_H