From 3b937a7c44a1acd633c22970d67ed3b6af2f701e Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Tue, 4 Sep 2007 04:47:48 +0000 Subject: Rename PBD::SearchPath::get_string to PBD::SearchPath::to_string git-svn-id: svn://localhost/ardour2/trunk@2369 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/theme_manager.cc | 2 +- libs/ardour/control_protocol_manager.cc | 2 +- libs/ardour/session_state.cc | 6 +++--- libs/pbd/file_utils.cc | 4 ++-- libs/pbd/pbd/search_path.h | 2 +- libs/pbd/search_path.cc | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index d89ca812f8..c1e662d016 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -189,7 +189,7 @@ load_rc_file (const string& filename, bool themechange) if(!find_file_in_search_path (spath, filename, rc_file_path)) { warning << string_compose(_("Unable to find UI style file %1 in search path %2. Ardour will look strange"), - filename, spath.get_string()) + filename, spath.to_string()) << endmsg; return; } diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 84791ab2c7..11c18175d1 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -198,7 +198,7 @@ ControlProtocolManager::discover_control_protocols () find_matching_files_in_search_path (control_protocol_search_path (), dylib_extension_pattern, cp_modules); - info << string_compose (_("looking for control protocols in %1"), control_protocol_search_path().get_string()) << endmsg; + info << string_compose (_("looking for control protocols in %1"), control_protocol_search_path().to_string()) << endmsg; for (vector::iterator i = cp_modules.begin(); i != cp_modules.end(); ++i) { control_protocol_discover ((*i).to_string()); diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 592908f488..ed1ae82f31 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -369,7 +369,7 @@ Session::raid_path () const raid_search_path += sys::path((*i).path); } - return raid_search_path.get_string (); + return raid_search_path.to_string (); } void @@ -406,8 +406,8 @@ Session::setup_raid_path (string path) // set the AudioFileSource and SMFSource search path - AudioFileSource::set_search_path (sound_search_path.get_string ()); - SMFSource::set_search_path (midi_search_path.get_string ()); + AudioFileSource::set_search_path (sound_search_path.to_string ()); + SMFSource::set_search_path (midi_search_path.to_string ()); // reset the round-robin soundfile path thingie diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc index af2c67b40c..efb065fbd4 100644 --- a/libs/pbd/file_utils.cc +++ b/libs/pbd/file_utils.cc @@ -106,7 +106,7 @@ find_file_in_search_path(const SearchPath& search_path, ( "Found no file named %1 in search path %2", filename, - search_path.get_string () + search_path.to_string () ) << endmsg; @@ -120,7 +120,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; } diff --git a/libs/pbd/pbd/search_path.h b/libs/pbd/pbd/search_path.h index e51d5de4ad..3b10d4a319 100644 --- a/libs/pbd/pbd/search_path.h +++ b/libs/pbd/pbd/search_path.h @@ -128,7 +128,7 @@ public: * The string that is returned contains the platform specific * path separator. */ - const string get_string () const; + const string to_string () const; /** * Assignment of another SearchPath to this. diff --git a/libs/pbd/search_path.cc b/libs/pbd/search_path.cc index b3590ba7bd..9956c6c763 100644 --- a/libs/pbd/search_path.cc +++ b/libs/pbd/search_path.cc @@ -80,7 +80,7 @@ SearchPath::add_directories (const vector& paths) } const string -SearchPath::get_string () const +SearchPath::to_string () const { string path; -- cgit v1.2.3