X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FGraph.cpp;h=86694eea585da9f5006da496ede63615a24c9f7e;hb=125ed160d625368520074f2898c0487d30d46b98;hp=fb7edbd34b95085b1e8015d9314a68da34c8fc54;hpb=bfd5abac4c24a309cfdd331f6cd6755f9ab529ac;p=lyx.git

diff --git a/src/Graph.cpp b/src/Graph.cpp
index fb7edbd34b..86694eea58 100644
--- a/src/Graph.cpp
+++ b/src/Graph.cpp
@@ -17,8 +17,6 @@
 #include "support/debug.h"
 #include "support/lassert.h"
 
-#include <algorithm>
-
 using namespace std;
 
 namespace lyx {
@@ -28,7 +26,7 @@ bool Graph::bfs_init(int s, bool clear_visited, queue<int> & Q)
 {
 	if (s < 0)
 		return false;
-	
+
 	if (!Q.empty())
 		Q = queue<int>();
 
@@ -47,11 +45,11 @@ bool Graph::bfs_init(int s, bool clear_visited, queue<int> & Q)
 
 
 Graph::EdgePath const
-	Graph::getReachableTo(int target, bool clear_visited)
+	Graph::getReachableTo(int to, bool clear_visited)
 {
 	EdgePath result;
 	queue<int> Q;
-	if (!bfs_init(target, clear_visited, Q))
+	if (!bfs_init(to, clear_visited, Q))
 		return result;
 
 	// Here's the logic, which is shared by the other routines.
@@ -63,7 +61,7 @@ Graph::EdgePath const
 	while (!Q.empty()) {
 		int const current = Q.front();
 		Q.pop();
-		if (current != target || formats.get(target).name() != "lyx")
+		if (current != to || theFormats().get(to).name() != "lyx")
 			result.push_back(current);
 
 		vector<Arrow *>::iterator it = vertices_[current].in_arrows.begin();
@@ -83,7 +81,7 @@ Graph::EdgePath const
 
 Graph::EdgePath const
 	Graph::getReachable(int from, bool only_viewable,
-		bool clear_visited, vector<int> excludes)
+		bool clear_visited, set<int> excludes)
 {
 	EdgePath result;
 	queue<int> Q;
@@ -93,12 +91,12 @@ Graph::EdgePath const
 	while (!Q.empty()) {
 		int const current = Q.front();
 		Q.pop();
-		Format const & format = formats.get(current);
+		Format const & format = theFormats().get(current);
 		if (!only_viewable || !format.viewer().empty())
 			result.push_back(current);
 		else if (format.isChildFormat()) {
 			Format const * const parent =
-				formats.getFormat(format.parentFormat());
+				theFormats().getFormat(format.parentFormat());
 			if (parent && !parent->viewer().empty())
 				result.push_back(current);
 		}
@@ -111,7 +109,7 @@ Graph::EdgePath const
 			int const cv = (*cit)->to;
 			if (!vertices_[cv].visited) {
 				vertices_[cv].visited = true;
-				if (find(excludes.begin(), excludes.end(), cv) == excludes.end())
+				if (excludes.find(cv) == excludes.end())
 					Q.push(cv);
 			}
 		}