diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2014-06-22 17:22:37 +1000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-25 12:40:10 -0400 |
| commit | 84d190b7cccdb5bbbae8467f97504cf05726b4ae (patch) | |
| tree | 638ce06e69470539fa35a48b76b2c219ce0be99e /libs | |
| parent | 26ec4038af0e84e6fe5d648c5dd1b76d19badd1f (diff) | |
Rename PBD::get_directory_contents to PBD::get_paths
shorter name and change order of parameters to match other functions
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/pbd/file_utils.cc | 14 | ||||
| -rw-r--r-- | libs/pbd/pbd/file_utils.h | 11 |
2 files changed, 13 insertions, 12 deletions
diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc index 08a99b3355..fcc2301ebb 100644 --- a/libs/pbd/file_utils.cc +++ b/libs/pbd/file_utils.cc @@ -134,10 +134,10 @@ run_functor_for_paths (vector<string>& result, } void -get_directory_contents (const std::string& directory_path, - vector<string>& result, - bool files_only, - bool recurse) +get_paths (vector<string>& result, + const std::string& directory_path, + bool files_only, + bool recurse) { // perhaps we don't need this check assuming an exception is thrown // as it would save checking that the path is a directory twice when @@ -159,7 +159,7 @@ get_directory_contents (const std::string& directory_path, DEBUG_TRACE (DEBUG::FileUtils, string_compose("Descending into directory: %1\n", fullpath)); - get_directory_contents (fullpath, result, files_only, recurse); + get_paths (result, fullpath, files_only, recurse); } i++; @@ -179,7 +179,7 @@ get_directory_contents (const std::string& directory_path, void get_files_in_directory (const std::string& directory_path, vector<string>& result) { - return get_directory_contents (directory_path, result, true, false); + return get_paths (result, directory_path, true, false); } static @@ -453,7 +453,7 @@ remove_directory_internal (const string& dir, size_t* size, vector<string>* path struct stat statbuf; int ret = 0; - get_directory_contents (dir, tmp_paths, just_remove_files, true); + get_paths (tmp_paths, dir, just_remove_files, true); for (vector<string>::const_iterator i = tmp_paths.begin(); i != tmp_paths.end(); ++i) { diff --git a/libs/pbd/pbd/file_utils.h b/libs/pbd/pbd/file_utils.h index ab42fd2357..04ce654f34 100644 --- a/libs/pbd/pbd/file_utils.h +++ b/libs/pbd/pbd/file_utils.h @@ -31,7 +31,8 @@ namespace PBD { /** - * Get a contents of directory. + * Get a list of path entries in a directory or within a directory tree + * if recursing. * @note paths in result will be absolute * * @param path An absolute path to a directory in the filename encoding @@ -41,10 +42,10 @@ namespace PBD { * @param recurse Recurse into child directories */ LIBPBD_API void -get_directory_contents (const std::string& path, - std::vector<std::string>& result, - bool files_only = true, - bool recurse = false); +get_paths (std::vector<std::string>& result, + const std::string& directory_path, + bool files_only = true, + bool recurse = false); /** * Get a list of files in a directory. |