Simplify things just a little bit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24967 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 5ca0fd58fc62cba233dbeff99a590c311bb559a2..8967fab12f52ca2c2f4cc7c8335c1fadffef284d 100644 (file)
--- a/src/BranchList.cpp
+++ b/src/BranchList.cpp
@@ -21,6 +21,20 @@ using namespace std;
 
 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.getBranch() == name_;
+       }
+private:
+       docstring name_;
+};
+}
+
 
 Branch::Branch() : selected_(false)
 {

diff --git a/src/BranchList.h b/src/BranchList.h
index 68cc46cebc8bad7715993f5ba9304c825438d2ae..00814ab95722e2aa3258bfd257a10d339f19f689 100644 (file)
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -115,17 +115,6 @@ private:
 };
 
 
-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

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 85e5a2a472a23be7e8dc12d84892c94518bca246..d2dbc527dc6ea476311743d4527a6d13ffc99756 100644 (file)
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -195,13 +195,10 @@ bool InsetBranch::isBranchSelected() const
 {
        Buffer const & realbuffer = *buffer().masterBuffer();
        BranchList const & branchlist = realbuffer.params().branchlist();
-       BranchList::const_iterator const end = branchlist.end();
-       BranchList::const_iterator it =
-               find_if(branchlist.begin(), end,
-                            BranchNamesEqual(params_.branch));
-       if (it == end)
+       Branch const * ourBranch = branchlist.find(params_.branch);
+       if (!ourBranch)
                return false;
-       return it->getSelected();
+       return ourBranch->getSelected();
 }