X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetbranch.C;h=67ecbc6e0b052376ab15797e12f3325fe6bbf53c;hb=4b1212acf2da860c58f1d579f74fae86e7e45a47;hp=a2e67e0e3c0978f88d8c2cd430dd3ac304ac9d9a;hpb=9387970e7da5663e2d76b0daef517afae6b5706a;p=features.git

diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C
index a2e67e0e3c..67ecbc6e0b 100644
--- a/src/insets/insetbranch.C
+++ b/src/insets/insetbranch.C
@@ -25,7 +25,6 @@
 
 #include "support/std_sstream.h"
 
-
 using std::string;
 using std::auto_ptr;
 using std::istringstream;
@@ -140,31 +139,19 @@ InsetBranch::priv_dispatch(FuncRequest const & cmd,
 			return DispatchResult(true);
 		}
 		return InsetCollapsable::priv_dispatch(cmd, idx, pos);
-		
+
 	default:
 		return InsetCollapsable::priv_dispatch(cmd, idx, pos);
 	}
 }
 
 
-namespace {
-
-struct SameBranch {
-	SameBranch(string const & branch_name) : bn(branch_name) {}
-	bool operator()(Branch const & branch) const
-		{ return bn == branch.getBranch(); }
-private:
-	string bn;
-};
-
-} // namespace anon
-
-
 bool InsetBranch::isBranchSelected(BranchList const & branchlist) const
 {
-	BranchList::const_iterator it = branchlist.begin();
 	BranchList::const_iterator const end = branchlist.end();
-	it = std::find_if(it, end, SameBranch(params_.branch));
+	BranchList::const_iterator it =
+		std::find_if(branchlist.begin(), end,
+			     BranchNamesEqual(params_.branch));
 	if (it == end)
 		return false;
 	return it->getSelected();