remove use of Glib::ustring from gtk2_ardour

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@10006 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 20 insertions, 20 deletions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 0d7eecc274..d8e7ae53cb 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1165,8 +1165,8 @@ ARDOUR_UI::open_recent_session ()
 			return;
 		}
 		
-		Glib::ustring path = (*i)[recent_session_columns.fullpath];
-		Glib::ustring state = (*i)[recent_session_columns.visible_name];
+		std::string path = (*i)[recent_session_columns.fullpath];
+		std::string state = (*i)[recent_session_columns.visible_name];
 		
 		_session_is_new = false;
 		
@@ -2151,7 +2151,7 @@ ARDOUR_UI::fontconfig_dialog ()
 	   may not and it can take a while to build it. Warn them.
 	*/
 	
-	Glib::ustring fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig");
+	std::string fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig");
 	
 	if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
 		MessageDialog msg (*new_session_dialog,
@@ -2173,7 +2173,7 @@ ARDOUR_UI::fontconfig_dialog ()
 }
 
 void
-ARDOUR_UI::parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring& session_name, Glib::ustring& session_path, bool& existing_session)
+ARDOUR_UI::parse_cmdline_path (const std::string& cmdline_path, std::string& session_name, std::string& session_path, bool& existing_session)
 {
 	existing_session = false;
 
@@ -2192,7 +2192,7 @@ ARDOUR_UI::parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring&
 }
 
 int
-ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::ustring& session_path, bool& existing_session)
+ARDOUR_UI::load_cmdline_session (const std::string& session_name, const std::string& session_path, bool& existing_session)
 {
 	/* when this is called, the backend audio system must be running */
 
@@ -2208,7 +2208,7 @@ ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::
 	
 	if (Glib::file_test (session_path, Glib::FILE_TEST_IS_DIR)) {
 
-		Glib::ustring predicted_session_file;
+		std::string predicted_session_file;
                 
                 predicted_session_file = Glib::build_filename (session_path, session_name + Session::statefile_suffix());
 		
@@ -2238,9 +2238,9 @@ ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::
 }
 
 bool
-ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path)
+ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path)
 {
-	Glib::ustring str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
+	std::string str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
 	
 	MessageDialog msg (str,
 			   false,
@@ -2264,7 +2264,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
 }
 
 int
-ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib::ustring& session_name)
+ARDOUR_UI::build_session_from_nsd (const std::string& session_path, const std::string& session_name)
 {
 	
 	uint32_t cchns;
@@ -2352,7 +2352,7 @@ ARDOUR_UI::loading_message (const std::string& msg)
 }
 
 void
-ARDOUR_UI::idle_load (const Glib::ustring& path)
+ARDOUR_UI::idle_load (const std::string& path)
 {
 	if (session) {
 
@@ -2383,9 +2383,9 @@ bool
 ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be_new)
 {
 	bool existing_session = false;
-	Glib::ustring session_name;
-	Glib::ustring session_path;
-	Glib::ustring template_name;
+	std::string session_name;
+	std::string session_path;
+	std::string template_name;
 	int response;
 	
   begin:
@@ -2513,7 +2513,7 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be
 
 			}
 
-			template_name = Glib::ustring();			
+			template_name = std::string();			
 			switch (new_session_dialog->which_page()) {
 
 			case NewSessionDialog::OpenPage: 
@@ -2532,7 +2532,7 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be
 				
 				should_be_new = true;
 
-				if (session_name.find ('/') != Glib::ustring::npos) {
+				if (session_name.find ('/') != std::string::npos) {
 					MessageDialog msg (*new_session_dialog, _("To ensure compatibility with various systems\n"
 							 "session names may not contain a '/' character"));
 					msg.run ();
@@ -2540,7 +2540,7 @@ ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be
 					goto try_again;
 				}
 
-				if (session_name.find ('\\') != Glib::ustring::npos) {
+				if (session_name.find ('\\') != std::string::npos) {
 					MessageDialog msg (*new_session_dialog, _("To ensure compatibility with various systems\n"
 							 "session names may not contain a '\\' character"));
 					msg.run ();
@@ -2625,7 +2625,7 @@ ARDOUR_UI::close_session ()
 }
 
 int
-ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_name, Glib::ustring mix_template)
+ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name, std::string mix_template)
 {
 	Session *new_session;
 	int unload_status;
@@ -2746,7 +2746,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 }
 
 int
-ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name, 
+ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name, 
 			  uint32_t control_channels,
 			  uint32_t master_channels, 
 			  AutoConnectOption input_connect,
@@ -2916,8 +2916,8 @@ require some unused files to continue to exist."));
 		    add (visible_name);
 		    add (fullpath);
 	    }
-	    Gtk::TreeModelColumn<Glib::ustring> visible_name;
-	    Gtk::TreeModelColumn<Glib::ustring> fullpath;
+	    Gtk::TreeModelColumn<std::string> visible_name;
+	    Gtk::TreeModelColumn<std::string> fullpath;
 	};