remove Glib::ustring from gtk2_ardour

git-svn-id: svn://localhost/ardour2/branches/3.0@7774 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 9 insertions, 10 deletions

diff --git a/gtk2_ardour/sfdb_ui.h b/gtk2_ardour/sfdb_ui.h
index 15affab570..d0cde342f8 100644
--- a/gtk2_ardour/sfdb_ui.h
+++ b/gtk2_ardour/sfdb_ui.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <vector>
 #include <map>
-#include <glibmm/ustring.h>
 
 #include <sigc++/signal.h>
 
@@ -58,14 +57,14 @@ class SoundFileBox : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 	virtual ~SoundFileBox () {};
 
 	void set_session (ARDOUR::Session* s);
-	bool setup_labels (const Glib::ustring& filename);
+	bool setup_labels (const std::string& filename);
 
 	void audition();
 	bool audition_oneshot();
 	bool autoplay () const;
 
   protected:
-	Glib::ustring path;
+	std::string path;
 
 	ARDOUR::SoundFileInfo sf_info;
 
@@ -110,7 +109,7 @@ class SoundFileBrowser : public ArdourDialog
 	class FoundTagColumns : public Gtk::TreeModel::ColumnRecord
 	{
 	  public:
-		Gtk::TreeModelColumn<Glib::ustring> pathname;
+		Gtk::TreeModelColumn<std::string> pathname;
 
 		FoundTagColumns() { add(pathname); }
 	};
@@ -126,7 +125,7 @@ class SoundFileBrowser : public ArdourDialog
 	virtual ~SoundFileBrowser ();
 
 	virtual void set_session (ARDOUR::Session*);
-	std::vector<Glib::ustring> get_paths ();
+	std::vector<std::string> get_paths ();
 
 	void clear_selection ();
 
@@ -155,7 +154,7 @@ class SoundFileBrowser : public ArdourDialog
 	Gtk::FileFilter matchall_filter;
 	Gtk::HBox hpacker;
 
-	static Glib::ustring persistent_folder;
+	static std::string persistent_folder;
 
 	Gtk::Notebook notebook;
 
@@ -196,7 +195,7 @@ class SoundFileChooser : public SoundFileBrowser
 	SoundFileChooser (Gtk::Window& parent, std::string title, ARDOUR::Session* _s = 0);
 	virtual ~SoundFileChooser () {};
 
-	Glib::ustring get_filename ();
+	std::string get_filename ();
 
   protected:
 	void on_hide();
@@ -230,7 +229,7 @@ class SoundFileOmega : public SoundFileBrowser
   private:
 	uint32_t selected_track_cnt;
 
-	typedef std::map<Glib::ustring,Editing::ImportDisposition> DispositionMap;
+	typedef std::map<std::string,Editing::ImportDisposition> DispositionMap;
 	DispositionMap disposition_map;
 
 	Gtk::HBox options;
@@ -238,10 +237,10 @@ class SoundFileOmega : public SoundFileBrowser
 	Gtk::VBox block_three;
 	Gtk::VBox block_four;
 
-	bool check_info (const std::vector<Glib::ustring>& paths,
+	bool check_info (const std::vector<std::string>& paths,
 			 bool& same_size, bool& src_needed, bool& multichannel);
 
-	static bool check_link_status (const ARDOUR::Session*, const std::vector<Glib::ustring>& paths);
+	static bool check_link_status (const ARDOUR::Session*, const std::vector<std::string>& paths);
 
 	void file_selection_changed ();
 	bool reset_options ();