summaryrefslogtreecommitdiff
path: root/gtk2_ardour/startup.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-09-14 16:51:02 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-09-14 16:51:02 +0000
commitda8eec7a8311295ee91308eca9fae2146385c512 (patch)
tree8353f003e048b3980bdf4e09f78a4c37d3ad6a59 /gtk2_ardour/startup.cc
parentc1ee2c6943623e43181d56eed0de18b608fff86a (diff)
remove Glib::ustring from gtk2_ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/startup.cc')
-rw-r--r--gtk2_ardour/startup.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 5ac50d7a8e..07a39fd418 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -180,7 +180,7 @@ ArdourStartup::use_session_template ()
}
}
-Glib::ustring
+std::string
ArdourStartup::session_template_name ()
{
if (!load_template_override.empty()) {
@@ -189,7 +189,7 @@ ArdourStartup::session_template_name ()
}
if (ic_existing_session_button.get_active()) {
- return ustring();
+ return string();
}
if (use_template_button.get_active()) {
@@ -203,7 +203,7 @@ ArdourStartup::session_template_name ()
}
}
-Glib::ustring
+std::string
ArdourStartup::session_name (bool& should_be_new)
{
if (ic_new_session_button.get_active()) {
@@ -229,11 +229,11 @@ ArdourStartup::session_name (bool& should_be_new)
}
}
-Glib::ustring
+std::string
ArdourStartup::session_folder ()
{
if (ic_new_session_button.get_active()) {
- Glib::ustring legal_session_folder_name = legalize_for_path (new_name_entry.get_text());
+ std::string legal_session_folder_name = legalize_for_path (new_name_entry.get_text());
return Glib::build_filename (new_folder_chooser.get_current_folder(), legal_session_folder_name);
} else if (_existing_session_chooser_used) {
/* existing session chosen from file chooser */