From c4323efbb7e51c484c32bd81f552f895e2dc030a Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Mon, 25 Feb 2013 15:25:17 +0100 Subject: [PATCH] Use path::is_child instead of custom code --- Frameworks/DocumentWindow/src/DocumentController.mm | 2 +- Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Frameworks/DocumentWindow/src/DocumentController.mm b/Frameworks/DocumentWindow/src/DocumentController.mm index 0f1e9181..1f779623 100644 --- a/Frameworks/DocumentWindow/src/DocumentController.mm +++ b/Frameworks/DocumentWindow/src/DocumentController.mm @@ -2273,7 +2273,7 @@ static NSUInteger DisableSessionSavingCount = 0; std::string const projectPath = to_s(candidate.projectPath); iterate(parent, parents) { - if(parent->find(projectPath) == 0 && (parent->size() == projectPath.size() || (*parent)[projectPath.size()] == '/')) + if(path::is_child(*parent, projectPath)) candidates.insert(std::make_pair(parent->size() - projectPath.size(), candidate)); } } diff --git a/Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm b/Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm index 54f6b2c4..6a136bd9 100644 --- a/Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm +++ b/Frameworks/OakFileBrowser/src/io/FSSCMDataSource.mm @@ -47,7 +47,7 @@ _Iter prune_path_parents (_Iter it, _Iter last) std::reverse(it, last); for(std::string child = NULL_STR; it != last; child = *it++) { - if(child.size() <= it->size() || child.at(it->size()) != '/' || child.find(*it) != 0) + if(!path::is_child(child, *it)) *out++ = *it; } return out; @@ -60,7 +60,7 @@ _Iter prune_path_children (_Iter it, _Iter last) std::sort(it, last); for(std::string parent = NULL_STR; it != last; ++it) { - if(it->size() <= parent.size() || it->at(parent.size()) != '/' || it->find(parent) != 0) + if(!path::is_child(*it, parent)) *out++ = parent = *it; } return out;