From 4d112a8e6b90fa64a5cd333042044768111ba994 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 14 Sep 2010 15:45:21 +0000
Subject: remove Glib::ustring from libardour; allow any characters except '/'
 and '\' in paths (may cause issues when loading creatively named 2.X
 sessions; fix a couple of details of name collection and usage from the
 startup dialog

git-svn-id: svn://localhost/ardour2/branches/3.0@7772 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/export_format_selector.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gtk2_ardour/export_format_selector.h')

diff --git a/gtk2_ardour/export_format_selector.h b/gtk2_ardour/export_format_selector.h
index 6e1dd52786..9533b15d9b 100644
--- a/gtk2_ardour/export_format_selector.h
+++ b/gtk2_ardour/export_format_selector.h
@@ -21,12 +21,12 @@
 #ifndef __export_format_selector_h__
 #define __export_format_selector_h__
 
-#include "ardour/export_profile_manager.h"
-
+#include <string>
 #include <gtkmm.h>
 #include <sigc++/signal.h>
 #include <boost/shared_ptr.hpp>
 
+#include "ardour/export_profile_manager.h"
 #include "ardour/session_handle.h"
 
 namespace ARDOUR {
@@ -76,7 +76,7 @@ class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 	{
 	  public:
 		Gtk::TreeModelColumn<FormatPtr>      format;
-		Gtk::TreeModelColumn<Glib::ustring>  label;
+		Gtk::TreeModelColumn<std::string>  label;
 
 		FormatCols () { add (format); add (label); }
 	};
-- 
cgit v1.2.3