projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4585179
)
Cleanup: use a namespace.
author
Carl Hetherington
<cth@carlh.net>
Sat, 13 May 2023 20:07:47 +0000
(22:07 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 13 May 2023 20:07:47 +0000
(22:07 +0200)
src/lib/dcp_content.cc
patch
|
blob
|
history
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index e7bef573b172dcbf7e9e6278541bd9457b8ba46e..87e59de50bc7ca27a14bfcde1d39b109b4e45429 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-192,16
+192,18
@@
DCPContent::read_directory (boost::filesystem::path p)
void
DCPContent::read_sub_directory (boost::filesystem::path p)
{
void
DCPContent::read_sub_directory (boost::filesystem::path p)
{
+ using namespace boost::filesystem;
+
LOG_GENERAL ("DCPContent::read_sub_directory reads %1", p.string());
LOG_GENERAL ("DCPContent::read_sub_directory reads %1", p.string());
- for (auto i:
boost::filesystem::
directory_iterator(p)) {
- if (
boost::filesystem::
is_regular_file(i.path())) {
+ for (auto i: directory_iterator(p)) {
+ if (is_regular_file(i.path())) {
LOG_GENERAL ("Inside there's regular file %1", i.path().string());
add_path (i.path());
LOG_GENERAL ("Inside there's regular file %1", i.path().string());
add_path (i.path());
- } else if (
boost::filesystem::
is_directory(i.path()) && i.path().filename() != ".AppleDouble") {
+ } else if (is_directory(i.path()) && i.path().filename() != ".AppleDouble") {
LOG_GENERAL ("Inside there's directory %1", i.path().string());
read_sub_directory (i.path());
} else {
LOG_GENERAL ("Inside there's directory %1", i.path().string());
read_sub_directory (i.path());
} else {
- LOG_GENERAL("Ignoring %1 from inside: status is %2", i.path().string(), static_cast<int>(
boost::filesystem::
status(i.path()).type()));
+ LOG_GENERAL("Ignoring %1 from inside: status is %2", i.path().string(), static_cast<int>(status(i.path()).type()));
}
}
}
}
}
}