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, 13 insertions, 17 deletions

diff --git a/libs/ardour/ardour/session_directory.h b/libs/ardour/ardour/session_directory.h
index 3e35c42de2..9a3f4d4d77 100644
--- a/libs/ardour/ardour/session_directory.h
+++ b/libs/ardour/ardour/session_directory.h
@@ -26,10 +26,6 @@
 
 namespace ARDOUR {
 
-using std::string;
-using std::vector;
-using PBD::sys::path;
-
 class SessionDirectory
 {
 public:
@@ -37,12 +33,12 @@ public:
 	/**
 	 * @param session_path An absolute path to a session directory.
 	 */
-	SessionDirectory (const path& session_path);
+	SessionDirectory (const PBD::sys::path& session_path);
 
 	/**
 	 * @return the absolute path to the root directory of the session
 	 */
-	const path root_path() const { return m_root_path; }
+	const PBD::sys::path root_path() const { return m_root_path; }
 
 	/**
 	 * @return the absolute path to the directory in which 
@@ -53,47 +49,47 @@ public:
 	 * directory otherwise it will return the new location
 	 * of root_path()/interchange/session_name/audiofiles
 	 */
-	const path sound_path () const;
+	const PBD::sys::path sound_path () const;
 	
 	/**
 	 * @return the absolute path to the directory in which 
 	 * the session stores MIDI files, ie
 	 * root_path()/interchange/session_name/midifiles
 	 */
-	const path midi_path () const;
+	const PBD::sys::path midi_path () const;
 	
 	/**
 	 * @return the absolute path to the directory in which 
 	 * the session stores MIDNAM patch files, ie
 	 * root_path()/interchange/session_name/patchfiles
 	 */
-	const path midi_patch_path () const;
+	const PBD::sys::path midi_patch_path () const;
 
 	/**
 	 * @return The absolute path to the directory in which all
 	 * peak files are stored for a session.
 	 */
-	const path peak_path () const;
+	const PBD::sys::path peak_path () const;
 
 	/**
 	 * @return The absolute path to the directory that audio
 	 * files are moved to when they are no longer part of the
 	 * session.
 	 */
-	const path dead_sound_path () const;
+	const PBD::sys::path dead_sound_path () const;
 	
 	/**
 	 * @return The absolute path to the directory that midi
 	 * files are moved to when they are no longer part of the
 	 * session.
 	 */
-	const path dead_midi_path () const;
+	const PBD::sys::path dead_midi_path () const;
 
 	/**
 	 * @return The absolute path to the directory that audio
 	 * files are created in by default when exporting.
 	 */
-	const path export_path () const;
+	const PBD::sys::path export_path () const;
 
 	/**
 	 * @return true if session directory and all the required 
@@ -120,22 +116,22 @@ protected:
 	 * @return The path to the old style sound directory.
 	 * It isn't created by create().
 	 */
-	const path old_sound_path () const;
+	const PBD::sys::path old_sound_path () const;
 
 	/**
 	 * @return The path to the directory under which source directories
 	 * are created for different source types.
 	 * i.e root_path()/interchange/session_name
 	 */
-	const path sources_root() const;
+	const PBD::sys::path sources_root() const;
 
 	/**
 	 * @return a vector containing the fullpath of all subdirectories.
 	 */
-	const vector<PBD::sys::path> sub_directories () const;
+	const std::vector<PBD::sys::path> sub_directories () const;
 
 	/// The path to the root of the session directory.
-	const path m_root_path;
+	const PBD::sys::path m_root_path;
 };
 
 } // namespace ARDOUR