summaryrefslogtreecommitdiff
path: root/gtk2_ardour/actions.cc
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2012-06-23 05:06:54 +0000
committerTim Mayberry <mojofunk@gmail.com>2012-06-23 05:06:54 +0000
commit105caf23daf5aed16c7ee8b904fcca2ddbd4f59f (patch)
tree4d74f6c8722790e6fb9d58888ea225866fc98d3c /gtk2_ardour/actions.cc
parent22e478e7fc4952dd386391e85d8e7fa2491ae953 (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/actions.cc')
-rw-r--r--gtk2_ardour/actions.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 5391d58f42..343dd20308 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -67,7 +67,7 @@ vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actio
void
ActionManager::init ()
{
- sys::path ui_file;
+ std::string ui_file;
ui_manager = UIManager::create ();
@@ -76,8 +76,8 @@ ActionManager::init ()
bool loaded = false;
try {
- ui_manager->add_ui_from_file (ui_file.to_string());
- info << string_compose (_("Loading menus from %1"), ui_file.to_string()) << endmsg;
+ ui_manager->add_ui_from_file (ui_file);
+ info << string_compose (_("Loading menus from %1"), ui_file) << endmsg;
loaded = true;
} catch (Glib::MarkupError& err) {
error << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endmsg;