Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h

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

4 files changed, 19 insertions, 24 deletions

diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h
index f73085e5ba..0b8f7e9422 100644
--- a/libs/ardour/ardour/export_profile_manager.h
+++ b/libs/ardour/ardour/export_profile_manager.h
@@ -32,6 +32,7 @@
 #include "pbd/uuid.h"
 #include "pbd/file_utils.h"
 #include "pbd/xml++.h"
+#include "pbd/filesystem.h"
 
 #include "ardour/filesystem_paths.h"
 #include "ardour/location.h"
@@ -90,7 +91,7 @@ class ExportProfileManager
 	ExportPresetPtr current_preset;
 	FileMap         preset_file_map;
 
-	std::vector<PBD::sys::path> find_file (std::string const & pattern);
+	std::vector<std::string> find_file (std::string const & pattern);
 
 	PBD::sys::path  export_config_dir;
 	PBD::SearchPath search_path;
diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h
index 120ae25f97..c8b01b79c3 100644
--- a/libs/ardour/ardour/filesystem_paths.h
+++ b/libs/ardour/ardour/filesystem_paths.h
@@ -20,7 +20,6 @@
 #ifndef ARDOUR_FILESYSTEM_PATHS_INCLUDED
 #define ARDOUR_FILESYSTEM_PATHS_INCLUDED
 
-#include "pbd/filesystem.h"
 #include "pbd/search_path.h"
 
 namespace ARDOUR {
@@ -29,13 +28,13 @@ namespace ARDOUR {
 	 * @return the path to the directory used to store user specific ardour
 	 * configuration files.
 	 */
-	PBD::sys::path user_config_directory ();
+	std::string user_config_directory ();
 
 	/**
 	 * @return the path to the directory that contains the system wide ardour
 	 * modules.
 	 */
-	PBD::sys::path ardour_dll_directory ();
+	std::string ardour_dll_directory ();
 
 	/**
 	 * @return the search path to be used when looking for per-system
diff --git a/libs/ardour/ardour/session_directory.h b/libs/ardour/ardour/session_directory.h
index 1972aa4039..3f6d5d5e7c 100644
--- a/libs/ardour/ardour/session_directory.h
+++ b/libs/ardour/ardour/session_directory.h
@@ -22,8 +22,6 @@
 #include <string>
 #include <vector>
 
-#include "pbd/filesystem.h"
-
 namespace ARDOUR {
 
 class SessionDirectory
@@ -33,7 +31,7 @@ public:
 	/**
 	 * @param session_path An absolute path to a session directory.
 	 */
-	SessionDirectory (const PBD::sys::path& session_path);
+	SessionDirectory (const std::string& session_path);
 
 	/**
 	 * Change the root path of this SessionDirectory object
@@ -43,7 +41,7 @@ public:
 	/**
 	 * @return the absolute path to the root directory of the session
 	 */
-	const PBD::sys::path root_path() const { return m_root_path; }
+	const std::string root_path() const { return m_root_path; }
 
 	/**
 	 * @return the absolute path to the directory in which
@@ -54,40 +52,40 @@ public:
 	 * directory otherwise it will return the new location
 	 * of root_path()/interchange/session_name/audiofiles
 	 */
-	const PBD::sys::path sound_path () const;
+	const std::string 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 PBD::sys::path midi_path () const;
+	const std::string 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 PBD::sys::path midi_patch_path () const;
+	const std::string midi_patch_path () const;
 
 	/**
 	 * @return The absolute path to the directory in which all
 	 * peak files are stored for a session.
 	 */
-	const PBD::sys::path peak_path () const;
+	const std::string peak_path () const;
 
 	/**
 	 * @return The absolute path to the directory that source
 	 * files are moved to when they are no longer part of the
 	 * session.
 	 */
-	const PBD::sys::path dead_path () const;
+	const std::string dead_path () const;
 
 	/**
 	 * @return The absolute path to the directory that audio
 	 * files are created in by default when exporting.
 	 */
-	const PBD::sys::path export_path () const;
+	const std::string export_path () const;
 
 	/**
 	 * @return true if session directory and all the required
@@ -98,9 +96,6 @@ public:
 	/**
 	 * Create the session directory and all the subdirectories.
 	 *
-	 * @throw PBD::sys::filesystem_error if the directories were
-	 * not able to be created.
-	 *
 	 * @return true If a new session directory was created, otherwise
 	 * (if it already existed) false.
 	 *
@@ -113,7 +108,7 @@ public:
 	 * are created for different source types.
 	 * i.e root_path()/interchange/session_name
 	 */
-	const PBD::sys::path sources_root() const;
+	const std::string sources_root() const;
 
 private:
 
@@ -121,15 +116,15 @@ private:
 	 * @return The path to the old style sound directory.
 	 * It isn't created by create().
 	 */
-	const PBD::sys::path old_sound_path () const;
+	const std::string old_sound_path () const;
 
 	/**
 	 * @return a vector containing the fullpath of all subdirectories.
 	 */
-	const std::vector<PBD::sys::path> sub_directories () const;
+	const std::vector<std::string> sub_directories () const;
 
 	/// The path to the root of the session directory.
-	PBD::sys::path m_root_path;
+	std::string m_root_path;
 };
 
 } // namespace ARDOUR
diff --git a/libs/ardour/ardour/session_state_utils.h b/libs/ardour/ardour/session_state_utils.h
index de58d3eff0..57fcf54ac4 100644
--- a/libs/ardour/ardour/session_state_utils.h
+++ b/libs/ardour/ardour/session_state_utils.h
@@ -43,8 +43,8 @@ bool create_backup_file (const PBD::sys::path & file_path);
  * @param directory_path The absolute path to a directory.
  * @param result vector to contain resulting state files.
  */
-void get_state_files_in_directory (const PBD::sys::path & directory_path,
-		std::vector<PBD::sys::path>& result);
+void get_state_files_in_directory (const std::string& directory_path,
+		std::vector<std::string>& result);
 
 /**
  * Given a vector of paths to files, return a vector containing
@@ -54,7 +54,7 @@ void get_state_files_in_directory (const PBD::sys::path & directory_path,
  * @return a vector containing a list of file names without any
  * filename extension.
  */
-std::vector<std::string> get_file_names_no_extension (const std::vector<PBD::sys::path> & file_paths);
+std::vector<std::string> get_file_names_no_extension (const std::vector<std::string> & file_paths);
 
 } // namespace ARDOUR