X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsession_import_dialog.h;h=f4ba9cadf7e66059109a4ccb92f8ba2eb8f519f2;hb=4770fea0a2b9b71850de9764868b53f85bfd594c;hp=cf1f5b0a4ec246ce5c9156293e8f75f80f645534;hpb=7e48118bf16702dc174875510b935f37290d56a7;p=ardour.git

diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h
index cf1f5b0a4e..f4ba9cadf7 100644
--- a/gtk2_ardour/session_import_dialog.h
+++ b/gtk2_ardour/session_import_dialog.h
@@ -34,8 +34,6 @@
 
 #include "ardour_dialog.h"
 
-using std::string;
-
 namespace ARDOUR {
 	class Session;
 }
@@ -45,39 +43,38 @@ class SessionImportDialog : public ArdourDialog
   private:
 	typedef boost::shared_ptr<ARDOUR::ElementImportHandler> HandlerPtr;
 	typedef std::list<HandlerPtr> HandlerList;
-	
+
 	typedef boost::shared_ptr<ARDOUR::ElementImporter> ElementPtr;
 	typedef std::list<ElementPtr> ElementList;
 
   public:
-	SessionImportDialog (ARDOUR::Session & target);
-	
+	SessionImportDialog (ARDOUR::Session* target);
+
 	virtual Gtk::FileChooserAction browse_action() const { return Gtk::FILE_CHOOSER_ACTION_OPEN; }
-	
+
   private:
 
-	void load_session (const string& filename);
+	void load_session (const std::string& filename);
 	void fill_list ();
 	void browse ();
 	void do_merge ();
 	void end_dialog ();
-	void update (string path);
+	void update (std::string path);
 	void show_info(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
-	
-	std::pair<bool, string> open_rename_dialog (string text, string name);
-	bool open_prompt_dialog (string text);
+
+	std::pair<bool, std::string> open_rename_dialog (std::string text, std::string name);
+	bool open_prompt_dialog (std::string text);
 
 	// Data
 	HandlerList        handlers;
 	XMLTree            tree;
-	ARDOUR::Session   &target;
 
 	// GUI
 	Gtk::Frame                    file_frame;
 	Gtk::HBox                     file_hbox;
 	Gtk::Entry                    file_entry;
 	Gtk::Button                   file_browse_button;
-	
+
 	struct SessionBrowserColumns : public Gtk::TreeModel::ColumnRecord
 	{
 	public:
@@ -88,14 +85,16 @@ class SessionImportDialog : public ArdourDialog
 
 	  SessionBrowserColumns() { add (name); add (queued); add (element); add (info); }
 	};
-	
+
 	SessionBrowserColumns         sb_cols;
 	Glib::RefPtr<Gtk::TreeStore>  session_tree;
 	Gtk::TreeView                 session_browser;
 	Gtk::ScrolledWindow           session_scroll;
-	
+
 	Gtk::Button*                  ok_button;
 	Gtk::Button*                  cancel_button;
+
+	PBD::ScopedConnectionList connections;
 };
 
 #endif