diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2014-06-17 11:48:46 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2014-06-17 21:14:13 +1000 |
| commit | ea5f9a8ea62f774258cd056e61e61648f91fe46e (patch) | |
| tree | dc6c1a5f8e34a30a9836617a0ceaf9896142635b /libs | |
| parent | b457c938cd0fc005deb332a11bf7cc9c9463e2bc (diff) | |
Move PathScanner::operator() into header
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/pbd/pathscanner.cc | 18 | ||||
| -rw-r--r-- | libs/pbd/pbd/pathscanner.h | 14 |
2 files changed, 13 insertions, 19 deletions
diff --git a/libs/pbd/pathscanner.cc b/libs/pbd/pathscanner.cc index fee1ffc84c..a320ec8d54 100644 --- a/libs/pbd/pathscanner.cc +++ b/libs/pbd/pathscanner.cc @@ -85,24 +85,6 @@ PathScanner::find_files_matching_regex (vector<string>& result, regfree (&compiled_pattern); } - -vector<string> -PathScanner::operator() (const string &dirpath, const string ®exp, - bool match_fullpath, bool return_fullpath, - long limit, bool recurse) - -{ - vector<string> result; - - find_files_matching_regex (result, - dirpath, - regexp, - match_fullpath, - return_fullpath, - limit, recurse); - - return result; -} void PathScanner::find_files_matching_filter (vector<string>& result, diff --git a/libs/pbd/pbd/pathscanner.h b/libs/pbd/pbd/pathscanner.h index a3a2b76237..d9522affe3 100644 --- a/libs/pbd/pbd/pathscanner.h +++ b/libs/pbd/pbd/pathscanner.h @@ -54,7 +54,19 @@ class LIBPBD_API PathScanner bool match_fullpath = true, bool return_fullpath = true, long limit = -1, - bool recurse = false); + bool recurse = false) + { + std::vector<std::string> result; + + find_files_matching_regex (result, + dirpath, + regexp, + match_fullpath, + return_fullpath, + limit, recurse); + + return result; + } private: |