namespace lyx {
-namespace {
-
-class BranchNamesEqual : public std::unary_function<Branch, bool>
-{
-public:
- BranchNamesEqual(docstring const & name)
- : name_(name)
- {}
-
- bool operator()(Branch const & branch) const
- {
- return branch.branch() == name_;
- }
-private:
- docstring name_;
-};
-
-}
-
-
Branch::Branch()
: selected_(false), filenameSuffix_(false)
{
}
+namespace {
+
+std::function<bool (Branch const &)> BranchNameIs(docstring const & d)
+{
+ return [d](Branch const & b){ return b.branch() == d; };
+}
+
+} // namespace
+
+
Branch * BranchList::find(docstring const & name)
{
List::iterator it =
- find_if(list.begin(), list.end(), BranchNamesEqual(name));
- return it == list.end() ? 0 : &*it;
+ find_if(list_.begin(), list_.end(), BranchNameIs(name));
+ return it == list_.end() ? nullptr : &*it;
}
Branch const * BranchList::find(docstring const & name) const
{
List::const_iterator it =
- find_if(list.begin(), list.end(), BranchNamesEqual(name));
- return it == list.end() ? 0 : &*it;
+ find_if(list_.begin(), list_.end(), BranchNameIs(name));
+ return it == list_.end() ? nullptr : &*it;
}
else
name = s.substr(i, j - i);
// Is this name already in the list?
- bool const already =
- find_if(list.begin(), list.end(),
- BranchNamesEqual(name)) != list.end();
+ bool const already = find(name);
if (!already) {
added = true;
Branch br;
br.setBranch(name);
br.setSelected(false);
br.setFileNameSuffix(false);
- list.push_back(br);
+ list_.push_back(br);
}
if (j == docstring::npos)
break;
bool BranchList::remove(docstring const & s)
{
- size_t const size = list.size();
- list.remove_if(BranchNamesEqual(s));
- return size != list.size();
+ size_t const size = list_.size();
+ list_.remove_if(BranchNameIs(s));
+ return size != list_.size();
}
{
if (newname.empty())
return false;
- if (find_if(list.begin(), list.end(),
- BranchNamesEqual(newname)) != list.end()) {
+ if (find(newname)) {
// new name already taken
if (merge)
return remove(oldname);
docstring BranchList::getFileNameSuffix() const
{
docstring result;
- List::const_iterator it = list.begin();
- for (; it != list.end(); ++it) {
- if (it->isSelected() && it->hasFileNameSuffix())
- result += "-" + it->branch();
+ for (auto const & br : list_) {
+ if (br.isSelected() && br.hasFileNameSuffix())
+ result += "-" + br.branch();
}
return support::subst(result, from_ascii("/"), from_ascii("_"));
}