Add scrollbar to edit presets dialogue, and the ability to differentiate between...

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

diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index af2c67b40c0b13e04e071cc3d6da64832af2b982..3705600b22c1066e6692857753cc5b91d5b895d4 100644 (file)
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -22,10 +22,12 @@
 #include <glibmm/fileutils.h>
 #include <glibmm/pattern.h>
 
-#include <pbd/compose.h>
-#include <pbd/file_utils.h>
+#include "pbd/compose.h"
+#include "pbd/file_utils.h"
 
-#include <pbd/error.h>
+#include "pbd/error.h"
+
+using namespace std;
 
 namespace PBD {
 
@@ -53,6 +55,7 @@ find_matching_files_in_directory (const sys::path& directory,
        vector<string> tmp_files;
 
        get_files_in_directory (directory, tmp_files);
+       result.reserve(tmp_files.size());
 
        for (vector<string>::iterator file_iter = tmp_files.begin();
                        file_iter != tmp_files.end();
@@ -85,9 +88,7 @@ find_matching_files_in_search_path (const SearchPath& search_path,
                                     const Glib::PatternSpec& pattern,
                                     vector<sys::path>& result)
 {
-       vector<sys::path> dirs;
-       std::copy(search_path.begin(), search_path.end(), std::back_inserter(dirs));
-       find_matching_files_in_directories (dirs, pattern, result);    
+       find_matching_files_in_directories (search_path, pattern, result);    
 }
 
 bool
@@ -102,14 +103,6 @@ find_file_in_search_path(const SearchPath& search_path,
 
        if (tmp.size() == 0)
        {
-               info << string_compose
-                       (
-                        "Found no file named %1 in search path %2",
-                        filename,
-                        search_path.get_string ()
-                       )
-                       << endmsg;
-
                return false;
        }
 
@@ -120,7 +113,7 @@ find_file_in_search_path(const SearchPath& search_path,
                        (
                         "Found more than one file matching %1 in search path %2",
                         filename,
-                        search_path.get_string ()
+                        search_path.to_string ()
                        )
                        << endmsg;
        }