Move PathScanner::operator() into header

diff --git a/libs/pbd/pathscanner.cc b/libs/pbd/pathscanner.cc
index fee1ffc84cdb9efde4c8bcc5c6270462407aa83b..a320ec8d54deadddd4019e87114c2c37650caeb7 100644 (file)
--- 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 &regexp,
-                        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 a3a2b762377fa232bc8f270638422b1696f0a8c5..d9522affe307f0402cd5d32ccbcc127c3200d404 100644 (file)
--- 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: