Remove most using declarations from header files.

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

1 files changed, 10 insertions, 12 deletions

diff --git a/libs/ardour/ardour/broadcast_info.h b/libs/ardour/ardour/broadcast_info.h
index dbad062b2b..8dfb697d08 100644
--- a/libs/ardour/ardour/broadcast_info.h
+++ b/libs/ardour/ardour/broadcast_info.h
@@ -28,8 +28,6 @@
 
 #include "ardour/types.h"
 
-using std::string;
-
 namespace ARDOUR
 {
 
@@ -44,7 +42,7 @@ class BroadcastInfo
 	~BroadcastInfo ();
 	
 	/// Returns last error sring from libsndfile
-	string get_error () const { return error; }
+	std::string get_error () const { return error; }
 	
 	/* Convenience functions */
 	
@@ -52,25 +50,25 @@ class BroadcastInfo
 	
 	/* Reading */
 	
-	bool load_from_file (string const & filename);
+	bool load_from_file (std::string const & filename);
 	bool load_from_file (SNDFILE* sf);
 	
-	string get_description () const;
+	std::string get_description () const;
 	int64_t get_time_reference () const;
 	struct tm get_origination_time () const;
-	string get_originator () const;
-	string get_originator_ref () const;
+	std::string get_originator () const;
+	std::string get_originator_ref () const;
 	
 	/* Writing */
 	
-	bool write_to_file (string const & filename);
+	bool write_to_file (std::string const & filename);
 	bool write_to_file (SNDFILE* sf);
 	
-	void set_description (string const & desc);
+	void set_description (std::string const & desc);
 	void set_time_reference (int64_t when);
 	void set_origination_time (struct tm * now = 0); // if 0, use time generated at construction
-	void set_originator (string const & str = "");
-	void set_originator_ref (string const & str = "");
+	void set_originator (std::string const & str = "");
+	void set_originator_ref (std::string const & str = "");
 	
 	/* State info */
 	
@@ -83,7 +81,7 @@ class BroadcastInfo
 	struct tm _time;
 	
 	void update_error ();
-	string error;
+	std::string error;
 	
 	bool _has_info;
 };