Remove PathScanner::run_scan and use PathScanner::run_scan_internal directly

[ardour.git] / libs / pbd / pathscanner.cc

diff --git a/libs/pbd/pathscanner.cc b/libs/pbd/pathscanner.cc
index 1a197b27aa2fa2ba677b121c3e5e98605e7f5fca..29c339c0879c3f0f2e32a5eeacc3d883f27de849 100644 (file)
--- a/libs/pbd/pathscanner.cc
+++ b/libs/pbd/pathscanner.cc
@@ -78,12 +78,10 @@ PathScanner::find_files_matching_regex (vector<string>& result,
                return;
        }
 
-       result = run_scan (dirpath,
-               regexp_filter,
-               &compiled_pattern,
-               match_fullpath,
-               return_fullpath,
-               limit, recurse);
+       run_scan_internal (result, dirpath,
+                          regexp_filter, &compiled_pattern,
+                          match_fullpath, return_fullpath,
+                          limit, recurse);
 
        regfree (&compiled_pattern);
 }
@@ -105,19 +103,6 @@ PathScanner::operator() (const string &dirpath, const string &regexp,
 
        return result;
 }      
-
-vector<string>
-PathScanner::run_scan (const string &dirpath, 
-                      bool (*filter)(const string &, void *),
-                      void *arg,
-                      bool match_fullpath, bool return_fullpath,
-                      long limit,
-                      bool recurse)
-{
-       vector<string> result;
-       run_scan_internal (result, dirpath, filter, arg, match_fullpath, return_fullpath, limit, recurse);
-       return result;
-}
        
 void
 PathScanner::run_scan_internal (vector<string>& result,