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 44f10213eb309aca522fb278be3984d3efee24b6..ce21d48e2866bdc1751f019ba26792ddad0797cb 100644 (file)
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -27,10 +27,10 @@
  */
 
 
-#ifndef BRANCHES_H
-#define BRANCHES_H
+#ifndef BRANCHLIST_H
+#define BRANCHLIST_H
 
-#include "Color.h"
+#include "ColorCode.h"
 
 #include "support/docstring.h"
 
@@ -39,23 +39,22 @@
 
 namespace lyx {
 
-
 class Branch {
 public:
        ///
        Branch();
        ///
-       docstring const & getBranch() const;
+       docstring const & branch() 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);
        ///
-       RGBColor const & getColor() const;
+       RGBColor const & color() const;
        ///
        void setColor(RGBColor const &);
        /**
@@ -114,20 +113,6 @@ private:
        docstring separator_;
 };
 
-
-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
 
-#endif
+#endif // BRANCHLIST_H