drop boost::signals2 and replace with carl's solution which continues to rely on...

[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 505583b3e0f62874c8e8fd0df1f79d9379256e43..de0eeeeb5a8925e165bef976bfe8104e4d846092 100644 (file)
--- a/libs/pbd/pbd/search_path.h
+++ b/libs/pbd/pbd/search_path.h
@@ -23,13 +23,10 @@
 #include <string>
 #include <vector>
 
-#include <pbd/filesystem.h>
+#include "pbd/filesystem.h"
 
 namespace PBD {
 
-using std::string;
-using std::vector;
-
 /**
  * @class The SearchPath class is a helper class for getting a 
  * vector of paths contained in a search path string where a 
@@ -39,7 +36,7 @@ using std::vector;
  * The SearchPath class does not test whether the paths exist
  * or are directories. It is basically just a container.
  */
-class SearchPath : public vector<sys::path>
+class SearchPath : public std::vector<sys::path>
 {
 public:
        /**
@@ -58,22 +55,22 @@ public:
         * 
         * @param search_path A path string.
         */
-       SearchPath (const string& search_path);
+       SearchPath (const std::string& search_path);
 
        /**
         * Initialize SearchPath from a sys::path.
         *
         * @param directory_path A directory path.
         */
-       SearchPath (const sys::path& directory_path);
+       SearchPath (const PBD::sys::path& directory_path);
 
        /**
         * Initialize SearchPath from a vector of paths that may or may
         * not exist.
         *
-        * @param path A path.
+        * @param paths A vector of paths.
         */
-       SearchPath (const vector<sys::path>& paths);
+       SearchPath (const std::vector<PBD::sys::path>& paths);
 
        /**
         * @return a search path string.
@@ -81,7 +78,7 @@ public:
         * The string that is returned contains the platform specific
         * path separator.
         */
-       const string to_string () const;
+       const std::string to_string () const;
 
        /**
         * Add all the directories in path to this.
@@ -91,7 +88,7 @@ public:
        /**
         * Add another directory path to the search path.
         */
-       SearchPath& operator+= (const sys::path& directory_path);
+       SearchPath& operator+= (const PBD::sys::path& directory_path);
        
        /**
         * Concatenate another SearchPath onto this.
@@ -101,18 +98,18 @@ public:
        /**
         * Add another path to the search path.
         */
-       SearchPath& operator+ (const sys::path& directory_path);
+       SearchPath& operator+ (const PBD::sys::path& 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);
+       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);
+       void add_directories (const std::vector<PBD::sys::path>& paths);
 };
 
 } // namespace PBD