Remaining changes needed for building libpdb on Windows (except for adding the extra...

[ardour.git] / libs / pbd / pbd / search_path.h

diff --git a/libs/pbd/pbd/search_path.h b/libs/pbd/pbd/search_path.h
index e51d5de4ad5014404212b734de1f686973f662e2..cc53dbebac606a4e06c3e5b2eedc5ffd498b3a9c 100644 (file)
--- a/libs/pbd/pbd/search_path.h
+++ b/libs/pbd/pbd/search_path.h
@@ -20,18 +20,19 @@
 #ifndef PBD_SEARCH_PATH_INCLUDED
 #define PBD_SEARCH_PATH_INCLUDED
 
+#ifdef SearchPath
+#undef SearchPath
+#endif
+
 #include <string>
 #include <vector>
 
-#include <pbd/filesystem.h>
-
 namespace PBD {
 
-using std::string;
-using std::vector;
-
 /**
- * @class The SearchPath class is a helper class for getting a 
+ * @class SearchPath
+ *
+ * The SearchPath class is a helper class for getting a
  * vector of paths contained in a search path string where a 
  * "search path string" contains absolute directory paths 
  * separated by a colon(:) or a semi-colon(;) on windows.
@@ -39,14 +40,9 @@ using std::vector;
  * The SearchPath class does not test whether the paths exist
  * or are directories. It is basically just a container.
  */
-class SearchPath {
+class SearchPath : public std::vector<std::string>
+{
 public:
-
-       typedef std::vector<sys::path>::iterator         iterator;
-       typedef std::vector<sys::path>::const_iterator   const_iterator;
-
-public:
-
        /**
         * Create an empty SearchPath.
         */
@@ -63,64 +59,15 @@ public:
         * 
         * @param search_path A path string.
         */
-       SearchPath (const string& search_path);
-
-       /**
-        * Initialize SearchPath from a sys::path.
-        *
-        * @param directory_path A directory path.
-        */
-       SearchPath (const sys::path& directory_path);
+       SearchPath (const std::string& search_path);
 
        /**
         * Initialize SearchPath from a vector of paths that may or may
         * not exist.
         *
-        * @param path A path.
-        */
-       SearchPath (const vector<sys::path>& paths);
-
-       /**
-        * The copy constructor does what you would expect and copies the
-        * vector of paths contained by the SearchPath.
+        * @param paths A vector of paths.
         */
-       SearchPath (const SearchPath& search_path);
-
-       /**
-        * Indicate whether there are any directory paths in m_dirs.
-        *
-        * If SearchPath is initialized with an empty string as the 
-        * result of for instance the contents of an unset environment
-        * variable.
-        *
-        * @return true if there are any paths in m_paths.
-        */
-       operator void* () const { return (void*)!m_dirs.empty(); }
-
-       /**
-        *  @return a read/write iterator that points to the first
-        *  path in the SearchPath. Iteration is done in ordinary
-        *  element order.
-        */
-       iterator begin () { return m_dirs.begin(); }
-       
-       /**
-        *  @return A read-only (constant) iterator that points to the
-        *  first path in the SearchPath.
-        */
-       const_iterator begin () const { return m_dirs.begin(); }
-
-       /**
-        *  @return A read/write iterator that points one past the last
-        *  path in the SearchPath.
-        */
-       iterator end () { return m_dirs.end(); }
-       
-       /**
-        *  @return A read-only (constant) iterator that points one past 
-        *  the last path in the SearchPath.
-        */
-       const_iterator end () const { return m_dirs.end(); }
+       SearchPath (const std::vector<std::string>& paths);
 
        /**
         * @return a search path string.
@@ -128,12 +75,7 @@ public:
         * The string that is returned contains the platform specific
         * path separator.
         */
-       const string get_string () const;
-
-       /**
-        * Assignment of another SearchPath to this.
-        */
-       SearchPath& operator= (const SearchPath& spath);
+       const std::string to_string () const;
 
        /**
         * Add all the directories in path to this.
@@ -143,7 +85,7 @@ public:
        /**
         * Add another directory path to the search path.
         */
-       SearchPath& operator+= (const sys::path& directory_path);
+       SearchPath& operator+= (const std::string& directory_path);
        
        /**
         * Concatenate another SearchPath onto this.
@@ -153,29 +95,19 @@ public:
        /**
         * Add another path to the search path.
         */
-       SearchPath& operator+ (const sys::path& directory_path);
+       SearchPath& operator+ (const std::string& directory_path);
 
        /**
         * Add a sub-directory to each path in the search path.
         * @param subdir The directory name, it should not contain 
         * any path separating tokens.
         */
-       SearchPath& add_subdirectory_to_paths (const string& subdir);
-
-       /**
-        * Add a sub-directory to each path in the search path.
-        * @see add_subdirectory_to_paths
-        */
-       SearchPath& operator/= (const string& subdir);
+       SearchPath& add_subdirectory_to_paths (const std::string& subdir);
 
 protected:
 
-       void add_directory (const sys::path& directory_path);
-
-       void add_directories (const vector<sys::path>& paths);
-       
-       vector<sys::path> m_dirs;
-
+       void add_directory (const std::string& directory_path);
+       void add_directories (const std::vector<std::string>& paths);
 };
 
 } // namespace PBD