diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:06:54 +0000 |
---|---|---|
committer | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:06:54 +0000 |
commit | 105caf23daf5aed16c7ee8b904fcca2ddbd4f59f (patch) | |
tree | 4d74f6c8722790e6fb9d58888ea225866fc98d3c /gtk2_ardour/ui_config.cc | |
parent | 22e478e7fc4952dd386391e85d8e7fa2491ae953 (diff) |
Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h
git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ui_config.cc')
-rw-r--r-- | gtk2_ardour/ui_config.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index b17316e2db..ff49301419 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -65,7 +65,7 @@ UIConfiguration::load_defaults () { int found = 0; - sys::path default_ui_rc_file; + std::string default_ui_rc_file; std::string rcfile; if (getenv ("ARDOUR_SAE")) { @@ -78,7 +78,7 @@ UIConfiguration::load_defaults () XMLTree tree; found = 1; - string rcfile = default_ui_rc_file.to_string(); + string rcfile = default_ui_rc_file; info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl; @@ -103,13 +103,13 @@ UIConfiguration::load_state () { bool found = false; - sys::path default_ui_rc_file; + std::string default_ui_rc_file; if ( find_file_in_search_path (ardour_config_search_path(), "ardour3_ui_default.conf", default_ui_rc_file)) { XMLTree tree; found = true; - string rcfile = default_ui_rc_file.to_string(); + string rcfile = default_ui_rc_file; info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl; @@ -124,13 +124,13 @@ UIConfiguration::load_state () } } - sys::path user_ui_rc_file; + std::string user_ui_rc_file; if (find_file_in_search_path (ardour_config_search_path(), "ardour3_ui.conf", user_ui_rc_file)) { XMLTree tree; found = true; - string rcfile = user_ui_rc_file.to_string(); + string rcfile = user_ui_rc_file; info << string_compose (_("Loading user ui configuration file %1"), rcfile) << endmsg; |