X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FGraph.cpp;h=036bb38857359e6d8a6f78b8c568b97ca6d8c89e;hb=62af7ee772f16f154225d2d0b65d77f4376b6001;hp=8d1e445157481c79c521e7e60d58e868df920caf;hpb=f2bfbfa975be56e6927fdfd3d6ed566f31064e5c;p=lyx.git

diff --git a/src/Graph.cpp b/src/Graph.cpp
index 8d1e445157..036bb38857 100644
--- a/src/Graph.cpp
+++ b/src/Graph.cpp
@@ -28,7 +28,7 @@ bool Graph::bfs_init(int s, bool clear_visited, queue<int> & Q)
 {
 	if (s < 0)
 		return false;
-	
+
 	if (!Q.empty())
 		Q = queue<int>();
 
@@ -63,7 +63,7 @@ Graph::EdgePath const
 	while (!Q.empty()) {
 		int const current = Q.front();
 		Q.pop();
-		if (current != target || formats.get(target).name() != "lyx")
+		if (current != target || theFormats().get(target).name() != "lyx")
 			result.push_back(current);
 
 		vector<Arrow *>::iterator it = vertices_[current].in_arrows.begin();
@@ -83,7 +83,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 +93,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 +111,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);
 			}
 		}
@@ -121,16 +121,6 @@ Graph::EdgePath const
 }
 
 
-Graph::EdgePath const
-	Graph::getReachable(int from, bool only_viewable,
-		bool clear_visited, int exclude)
-{
-	vector<int> excludes;
-	excludes.push_back(exclude);
-	return getReachable(from, only_viewable, clear_visited, excludes);
-}
-
-
 bool Graph::isReachable(int from, int to)
 {
 	if (from == to)