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/utils.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/utils.cc')
| -rw-r--r-- | gtk2_ardour/utils.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index b8594b7b2f..905ecd78f9 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -498,14 +498,14 @@ get_xpm (std::string name) spath.add_subdirectory_to_paths("pixmaps"); - sys::path data_file_path; + std::string data_file_path; if(!find_file_in_search_path (spath, name, data_file_path)) { fatal << string_compose (_("cannot find XPM file for %1"), name) << endmsg; } try { - xpm_map[name] = Gdk::Pixbuf::create_from_file (data_file_path.to_string()); + xpm_map[name] = Gdk::Pixbuf::create_from_file (data_file_path); } catch(const Glib::Error& e) { warning << "Caught Glib::Error: " << e.what() << endmsg; } @@ -524,13 +524,13 @@ get_icon_path (const char* cname) spath.add_subdirectory_to_paths("icons"); - sys::path data_file_path; + std::string data_file_path; if (!find_file_in_search_path (spath, name, data_file_path)) { fatal << string_compose (_("cannot find icon image for %1 using %2"), name, spath.to_string()) << endmsg; } - return data_file_path.to_string(); + return data_file_path; } Glib::RefPtr<Gdk::Pixbuf> |