From 32f1dce79a791697d3fcbc8c29c723647e477727 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@comcast.net>
Date: Tue, 27 May 2008 18:57:16 +0000
Subject: [PATCH] Simplify things just a little bit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24967 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/BranchList.cpp         | 14 ++++++++++++++
 src/BranchList.h           | 11 -----------
 src/insets/InsetBranch.cpp |  9 +++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 5ca0fd58fc..8967fab12f 100644
--- 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 68cc46cebc..00814ab957 100644
--- 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 85e5a2a472..d2dbc527dc 100644
--- 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();
 }
 
 
-- 
2.39.2