anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove functors in IndicesList.cpp.

Browse Source
This commit is contained in:
Richard Kimberly Heck 2020-05-04 20:00:55 -04:00
parent 958958453f
commit 5989160154
1 changed files with 22 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/IndicesList.cpp
View File

@ -25,42 +25,6 @@ using namespace lyx::support;
namespace lyx {
namespace {
class IndexNamesEqual : public std::unary_function<Index, bool>
{
public:
IndexNamesEqual(docstring const & name)
: name_(name)
{}
bool operator()(Index const & index) const
{
return index.index() == name_;
}
private:
docstring name_;
};
class IndexHasShortcut : public std::unary_function<Index, bool>
{
public:
IndexHasShortcut(docstring const & shortcut)
: shortc_(shortcut)
{}
bool operator()(Index const & index) const
{
return index.shortcut() == shortc_;
}
private:
docstring shortc_;
};
} // namespace
/////////////////////////////////////////////////////////////////////
//
// Index
@ -136,6 +100,16 @@ void Index::setColor(string const & str)
/////////////////////////////////////////////////////////////////////
namespace{
std::function<bool (Index const &)> IndexNamesEqual(docstring const & name)
{
return [name](Index const & idx){ return idx.index() == name; };
}
}
Index * IndicesList::find(docstring const & name)
{
List::iterator it =
@ -152,6 +126,16 @@ Index const * IndicesList::find(docstring const & name) const
}
namespace {
std::function<bool (Index const &)> IndexHasShortcut(docstring const & sc)
{
return [sc](Index const & idx){ return idx.shortcut() == sc; };
}
} // namespace
Index * IndicesList::findShortcut(docstring const & shortcut)
{
List::iterator it =
@ -180,9 +164,7 @@ bool IndicesList::add(docstring const & n, docstring const & s)
else
name = n.substr(i, j - i);
// Is this name already in the list?
bool const already =
find_if(list.begin(), list.end(),
IndexNamesEqual(name)) != list.end();
bool const already = find(name);
if (!already) {
added = true;
Index in;
@ -230,8 +212,7 @@ bool IndicesList::rename(docstring const & oldname,
{
if (newname.empty())
return false;
if (find_if(list.begin(), list.end(),
IndexNamesEqual(newname)) != list.end())
if (find(newname))
// new name already taken
return false;