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, 49 insertions, 52 deletions

diff --git a/libs/ardour/ardour/session_metadata.h b/libs/ardour/ardour/session_metadata.h
index e579c5102b..71dd59904c 100644
--- a/libs/ardour/ardour/session_metadata.h
+++ b/libs/ardour/ardour/session_metadata.h
@@ -31,9 +31,6 @@
 
 namespace ARDOUR {
 
-using std::string;
-using Glib::ustring;
-
 /** Represents metadata associated to a Session
  * Metadata can be accessed and edited via this class.
  * Exported files can also be tagged with this data.
@@ -45,68 +42,68 @@ class SessionMetadata : public PBD::StatefulDestructible
 	~SessionMetadata ();
 	
 	/*** Accessing ***/
-	ustring comment () const;
-	ustring copyright () const;
-	ustring isrc () const;
+	Glib::ustring comment () const;
+	Glib::ustring copyright () const;
+	Glib::ustring isrc () const;
 	uint32_t year () const;
 
-	ustring grouping () const;
-	ustring title () const;
-	ustring subtitle () const;
+	Glib::ustring grouping () const;
+	Glib::ustring title () const;
+	Glib::ustring subtitle () const;
 	
-	ustring artist () const;
-	ustring album_artist () const;
-	ustring lyricist () const;
-	ustring composer () const;
-	ustring conductor () const;
-	ustring remixer () const;
-	ustring arranger () const;
-	ustring engineer () const;
-	ustring producer () const;
-	ustring dj_mixer () const;
-	ustring mixer () const;
+	Glib::ustring artist () const;
+	Glib::ustring album_artist () const;
+	Glib::ustring lyricist () const;
+	Glib::ustring composer () const;
+	Glib::ustring conductor () const;
+	Glib::ustring remixer () const;
+	Glib::ustring arranger () const;
+	Glib::ustring engineer () const;
+	Glib::ustring producer () const;
+	Glib::ustring dj_mixer () const;
+	Glib::ustring mixer () const;
 	
-	ustring album () const;
-	ustring compilation () const;
-	ustring disc_subtitle () const;
+	Glib::ustring album () const;
+	Glib::ustring compilation () const;
+	Glib::ustring disc_subtitle () const;
 	uint32_t disc_number () const;
 	uint32_t total_discs () const;
 	uint32_t track_number () const;
 	uint32_t total_tracks () const;
 	
-	ustring genre () const;
+	Glib::ustring genre () const;
 	
 	/*** Editing ***/
-	void set_comment (const ustring &);
-	void set_copyright (const ustring &);
-	void set_isrc (const ustring &);
+	void set_comment (const Glib::ustring &);
+	void set_copyright (const Glib::ustring &);
+	void set_isrc (const Glib::ustring &);
 	void set_year (uint32_t);
 	
-	void set_grouping (const ustring &);
-	void set_title (const ustring &);
-	void set_subtitle (const ustring &);
+	void set_grouping (const Glib::ustring &);
+	void set_title (const Glib::ustring &);
+	void set_subtitle (const Glib::ustring &);
 	
-	void set_artist (const ustring &);
-	void set_album_artist (const ustring &);
-	void set_lyricist (const ustring &);
-	void set_composer (const ustring &);
-	void set_conductor (const ustring &);
-	void set_remixer (const ustring &);
-	void set_arranger (const ustring &);
-	void set_engineer (const ustring &);
-	void set_producer (const ustring &);
-	void set_dj_mixer (const ustring &);
-	void set_mixer (const ustring &);
+	void set_artist (const Glib::ustring &);
+	void set_album_artist (const Glib::ustring &);
+	void set_lyricist (const Glib::ustring &);
+	void set_composer (const Glib::ustring &);
+	void set_conductor (const Glib::ustring &);
+	void set_remixer (const Glib::ustring &);
+	void set_arranger (const Glib::ustring &);
+	void set_engineer (const Glib::ustring &);
+	void set_producer (const Glib::ustring &);
+	void set_dj_mixer (const Glib::ustring &);
+	void set_mixer (const Glib::ustring &);
 	
-	void set_album (const ustring &);
-	void set_compilation (const ustring &);
-	void set_disc_subtitle (const ustring &);
+	void set_album (const Glib::ustring &);
+	void set_compilation (const Glib::ustring &);
+	void set_disc_subtitle (const Glib::ustring &);
 	void set_disc_number (uint32_t);
 	void set_total_discs (uint32_t);
 	void set_track_number (uint32_t);
 	void set_total_tracks (uint32_t);
 	
-	void set_genre (const ustring &);
+	void set_genre (const Glib::ustring &);
 	
 	/*** Serialization ***/
 	XMLNode & get_state ();
@@ -114,17 +111,17 @@ class SessionMetadata : public PBD::StatefulDestructible
 
   private:
 	
-	typedef std::pair<ustring, ustring> Property;
-	typedef std::map<ustring, ustring> PropertyMap;
+	typedef std::pair<Glib::ustring, Glib::ustring> Property;
+	typedef std::map<Glib::ustring, Glib::ustring> PropertyMap;
 	PropertyMap map;
 
-	XMLNode * get_xml (const ustring & name);
+	XMLNode * get_xml (const Glib::ustring & name);
 	
-	ustring get_value (const ustring & name) const;
-	uint32_t get_uint_value (const ustring & name) const;
+	Glib::ustring get_value (const Glib::ustring & name) const;
+	uint32_t get_uint_value (const Glib::ustring & name) const;
 	
-	void set_value (const ustring & name, const ustring & value);
-	void set_value (const ustring & name, uint32_t value);
+	void set_value (const Glib::ustring & name, const Glib::ustring & value);
+	void set_value (const Glib::ustring & name, uint32_t value);
 };
 
 } // namespace ARDOUR