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();
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;
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);
}
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);
}
}
}
-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);
-}
-
-
-Graph::EdgePath const
- Graph::getReachable(int from, bool only_viewable,
- bool clear_visited)
-{
- vector<int> excludes;
- return getReachable(from, only_viewable, clear_visited, excludes);
-}
-
-
bool Graph::isReachable(int from, int to)
{
if (from == to)