X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBranchList.h;h=ce21d48e2866bdc1751f019ba26792ddad0797cb;hb=0de1e7730fe798b95b9a9bd92d8bd2853ab5c997;hp=3f2978acee0d96b31b245a54f57b6f5ef5a5f819;hpb=00e305c9d9bd8b0ff54b6c58adb6192d5934ed60;p=lyx.git

diff --git a/src/BranchList.h b/src/BranchList.h
index 3f2978acee..ce21d48e28 100644
--- 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,30 +39,29 @@
 
 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 &);
 	/**
 	 * 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 &);
 
@@ -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