summaryrefslogtreecommitdiff
path: root/gtk2_ardour/session_import_dialog.h
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-05-12 17:03:42 +0000
committerCarl Hetherington <carl@carlh.net>2009-05-12 17:03:42 +0000
commit3b89d9eaa03406a5e03648f47734211f09b89d62 (patch)
tree1c8d151bca327d4a5cb7047c8591aa814b9b4ec8 /gtk2_ardour/session_import_dialog.h
parent2e5c935990d6ea5cc6e9a5a6de0fd8c52e68657c (diff)
Remove most using declarations from header files.
git-svn-id: svn://localhost/ardour2/branches/3.0@5069 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/session_import_dialog.h')
-rw-r--r--gtk2_ardour/session_import_dialog.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk2_ardour/session_import_dialog.h b/gtk2_ardour/session_import_dialog.h
index cf1f5b0a4e..74da13855a 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;
}
@@ -56,16 +54,16 @@ class SessionImportDialog : public ArdourDialog
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;