From 2334880bc9ee571fbb397461cbecd0121f6695be Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Tue, 17 Jun 2014 11:48:46 +1000 Subject: [PATCH] Move PathScanner::operator() into header --- libs/pbd/pathscanner.cc | 18 ------------------ 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& result, regfree (&compiled_pattern); } - -vector -PathScanner::operator() (const string &dirpath, const string ®exp, - bool match_fullpath, bool return_fullpath, - long limit, bool recurse) - -{ - vector result; - - find_files_matching_regex (result, - dirpath, - regexp, - match_fullpath, - return_fullpath, - limit, recurse); - - return result; -} void PathScanner::find_files_matching_filter (vector& 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 result; + + find_files_matching_regex (result, + dirpath, + regexp, + match_fullpath, + return_fullpath, + limit, recurse); + + return result; + } private: