diff options
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/file_utils.cc | 6 | ||||
| -rw-r--r-- | libs/pbd/pbd/file_utils.h | 8 | ||||
| -rw-r--r-- | libs/pbd/system_exec.cc | 2 | ||||
| -rw-r--r-- | libs/pbd/test/xpath.cc | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc index bc4ad8ee6d..9db71c25c0 100644 --- a/libs/pbd/file_utils.cc +++ b/libs/pbd/file_utils.cc @@ -147,9 +147,9 @@ find_files_matching_pattern (vector<string>& result, } bool -find_file_in_search_path(const Searchpath& search_path, - const string& filename, - std::string& result) +find_file (const Searchpath& search_path, + const string& filename, + std::string& result) { vector<std::string> tmp; diff --git a/libs/pbd/pbd/file_utils.h b/libs/pbd/pbd/file_utils.h index 8fef0c4d45..1943790de6 100644 --- a/libs/pbd/pbd/file_utils.h +++ b/libs/pbd/pbd/file_utils.h @@ -90,15 +90,15 @@ find_files_matching_pattern (std::vector<std::string>& result, const std::string& pattern); /** - * Takes a search path and a file name and place the full path + * Takes a search path and a file name and places the full path * to that file in result if it is found within the search path. * * @return true If file is found within the search path. */ LIBPBD_API bool -find_file_in_search_path (const Searchpath& search_path, - const std::string& filename, - std::string& result); +find_file (const Searchpath& search_path, + const std::string& filename, + std::string& result); /** diff --git a/libs/pbd/system_exec.cc b/libs/pbd/system_exec.cc index 5d2db21efc..b11ef1ce0e 100644 --- a/libs/pbd/system_exec.cc +++ b/libs/pbd/system_exec.cc @@ -195,7 +195,7 @@ SystemExec::SystemExec (std::string command, const std::map<char, std::string> s { init (); make_argp_escaped(command, subs); - if (!find_file_in_search_path (Searchpath (Glib::getenv ("PATH")), argp[0], cmd)) { + if (!find_file (Searchpath (Glib::getenv ("PATH")), argp[0], cmd)) { // not found in path - use as-is cmd = argp[0]; } diff --git a/libs/pbd/test/xpath.cc b/libs/pbd/test/xpath.cc index 8b80eec2c6..4d6f260c27 100644 --- a/libs/pbd/test/xpath.cc +++ b/libs/pbd/test/xpath.cc @@ -18,7 +18,7 @@ XPathTest::testMisc () // cout << "Test 1: RosegardenPatchFile.xml: Find all banks in the file" << endl; std::string testdata_path; - CPPUNIT_ASSERT (find_file_in_search_path (test_search_path (), "RosegardenPatchFile.xml", testdata_path)); + CPPUNIT_ASSERT (find_file (test_search_path (), "RosegardenPatchFile.xml", testdata_path)); XMLTree doc(testdata_path); // "//bank" gives as last element an empty element libxml bug???? @@ -51,7 +51,7 @@ XPathTest::testMisc () // We have to allocate a new document here, or we get segfaults std::string testsession_path; - CPPUNIT_ASSERT (find_file_in_search_path (test_search_path (), "TestSession.ardour", testsession_path)); + CPPUNIT_ASSERT (find_file (test_search_path (), "TestSession.ardour", testsession_path)); XMLTree doc2(testsession_path); result = doc2.find("/Session/Sources/Source[contains(@captured-for, 'Guitar')]"); @@ -77,7 +77,7 @@ XPathTest::testMisc () // cout << endl << endl << "Test 5: ProtoolsPatchFile.midnam: Get Banks and Patches for 'Name Set 1'" << endl; std::string testmidnam_path; - CPPUNIT_ASSERT (find_file_in_search_path (test_search_path (), "ProtoolsPatchFile.midnam", testmidnam_path)); + CPPUNIT_ASSERT (find_file (test_search_path (), "ProtoolsPatchFile.midnam", testmidnam_path)); // We have to allocate a new document here, or we get segfaults XMLTree doc3(testmidnam_path); |