X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBranchList.h;h=ce21d48e2866bdc1751f019ba26792ddad0797cb;hb=0de1e7730fe798b95b9a9bd92d8bd2853ab5c997;hp=c0b18b57a0ebf5e2056dfbef2266f437d9c6824e;hpb=399e6e788cee5fb7d4a916365a4ef60f30cfe654;p=lyx.git diff --git a/src/BranchList.h b/src/BranchList.h index c0b18b57a0..ce21d48e28 100644 --- a/src/BranchList.h +++ b/src/BranchList.h @@ -27,49 +27,51 @@ */ -#ifndef BRANCHES_H -#define BRANCHES_H +#ifndef BRANCHLIST_H +#define BRANCHLIST_H -#include "Color.h" +#include "ColorCode.h" + +#include "support/docstring.h" -#include #include +namespace lyx { + class Branch { public: /// Branch(); /// - std::string const & getBranch() const; + 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); /// - lyx::RGBColor const & getColor() const; + RGBColor const & color() const; /// - void setColor(lyx::RGBColor 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 &); - private: /// - std::string branch_; + docstring branch_; /// bool selected_; /// - lyx::RGBColor color_; + RGBColor color_; }; @@ -80,7 +82,7 @@ public: typedef List::const_iterator const_iterator; /// - BranchList() : separator_("|") {} + BranchList() : separator_(from_ascii("|")) {} /// bool empty() const { return list.empty(); } @@ -92,36 +94,25 @@ public: /** \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_; }; +} // namespace lyx -class BranchNamesEqual : public std::unary_function { -public: - BranchNamesEqual(std::string const & name) - : name_(name) {} - bool operator()(Branch const & branch) const - { - return branch.getBranch() == name_; - } -private: - std::string name_; -}; - -#endif +#endif // BRANCHLIST_H