Rename SearchPath class Searchpath

Windows headers define SearchPath which means we have to undefine it
where necessary. This is a pain and can be tricksy, so I feel renaming
the class slightly is the easiest solution.

8 files changed, 19 insertions, 27 deletions

diff --git a/libs/ardour/ardour/control_protocol_search_path.h b/libs/ardour/ardour/control_protocol_search_path.h
index 8795f4501a..4fe790ef80 100644
--- a/libs/ardour/ardour/control_protocol_search_path.h
+++ b/libs/ardour/ardour/control_protocol_search_path.h
@@ -25,15 +25,15 @@
 namespace ARDOUR {
 
 	/**
-	 * return a SearchPath containing directories in which to look for
+	 * return a Searchpath containing directories in which to look for
 	 * control surface plugins.
 	 *
-	 * If ARDOUR_SURFACES_PATH is defined then the SearchPath returned
+	 * If ARDOUR_SURFACES_PATH is defined then the Searchpath returned
 	 * will contain only those directories specified in it, otherwise it will
 	 * contain the user and system directories which may contain control
 	 * surface plugins.
 	 */
-	PBD::SearchPath control_protocol_search_path ();
+	PBD::Searchpath control_protocol_search_path ();
 
 } // namespace ARDOUR
 
diff --git a/libs/ardour/ardour/export_formats_search_path.h b/libs/ardour/ardour/export_formats_search_path.h
index 7b6fcea09b..771c6f9bd3 100644
--- a/libs/ardour/ardour/export_formats_search_path.h
+++ b/libs/ardour/ardour/export_formats_search_path.h
@@ -24,10 +24,10 @@
 namespace ARDOUR {
 
 	/**
-	 * return a SearchPath containing directories in which to look for
+	 * return a Searchpath containing directories in which to look for
 	 * export_formats.
 	 */
-	PBD::SearchPath export_formats_search_path ();
+	PBD::Searchpath export_formats_search_path ();
 
 } // namespace ARDOUR
 
diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h
index 114fb09647..77ace497c2 100644
--- a/libs/ardour/ardour/export_profile_manager.h
+++ b/libs/ardour/ardour/export_profile_manager.h
@@ -38,10 +38,6 @@
 #include "ardour/types.h"
 #include "ardour/export_handler.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
 namespace ARDOUR
 {
 
@@ -106,7 +102,7 @@ class ExportProfileManager
 	std::vector<std::string> find_file (std::string const & pattern);
 
 	std::string  export_config_dir;
-	PBD::SearchPath search_path;
+	PBD::Searchpath search_path;
 
 /* Timespans */
   public:
diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h
index 7c817e86a1..e77de1c00f 100644
--- a/libs/ardour/ardour/filesystem_paths.h
+++ b/libs/ardour/ardour/filesystem_paths.h
@@ -22,10 +22,6 @@
 
 #include "pbd/search_path.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
 namespace ARDOUR {
 
 	/**
@@ -45,14 +41,14 @@ namespace ARDOUR {
 	 * @return the search path to be used when looking for per-system
 	 * configuration files. This may include user configuration files.
 	 */
-	PBD::SearchPath ardour_config_search_path ();
+	PBD::Searchpath ardour_config_search_path ();
 
 	/**
 	 * @return the search path to be used when looking for data files
 	 * that could be shared by systems (h/w and configuration independent
 	 * files, such as icons, XML files, etc)
 	 */
-	PBD::SearchPath ardour_data_search_path ();
+	PBD::Searchpath ardour_data_search_path ();
 
 } // namespace ARDOUR
 
diff --git a/libs/ardour/ardour/ladspa_search_path.h b/libs/ardour/ardour/ladspa_search_path.h
index 791bba9188..bc184b5248 100644
--- a/libs/ardour/ardour/ladspa_search_path.h
+++ b/libs/ardour/ardour/ladspa_search_path.h
@@ -25,14 +25,14 @@
 namespace ARDOUR {
 
 	/**
-	 * return a SearchPath containing directories in which to look for
+	 * return a Searchpath containing directories in which to look for
 	 * LADSPA plugins.
 	 *
-	 * If LADSPA_PATH is defined then the SearchPath returned
+	 * If LADSPA_PATH is defined then the Searchpath returned
 	 * will contain the directories specified in it as well as the
 	 * user and system directories.
 	 */
-	PBD::SearchPath ladspa_search_path ();
+	PBD::Searchpath ladspa_search_path ();
 
 } // namespace ARDOUR
 
diff --git a/libs/ardour/ardour/lv2_bundled_search_path.h b/libs/ardour/ardour/lv2_bundled_search_path.h
index f5780c5e0e..9314ee27d4 100644
--- a/libs/ardour/ardour/lv2_bundled_search_path.h
+++ b/libs/ardour/ardour/lv2_bundled_search_path.h
@@ -25,10 +25,10 @@
 namespace ARDOUR {
 
 	/**
-	 * return a SearchPath containing directories in which to look for
+	 * return a Searchpath containing directories in which to look for
 	 * lv2 plugins.
 	 */
-	PBD::SearchPath lv2_bundled_search_path ();
+	PBD::Searchpath lv2_bundled_search_path ();
 
 } // namespace ARDOUR
 
diff --git a/libs/ardour/ardour/midi_patch_search_path.h b/libs/ardour/ardour/midi_patch_search_path.h
index 5d27823461..168e75af4a 100644
--- a/libs/ardour/ardour/midi_patch_search_path.h
+++ b/libs/ardour/ardour/midi_patch_search_path.h
@@ -24,15 +24,15 @@
 namespace ARDOUR {
 
 	/**
-	 * return a SearchPath containing directories in which to look for
+	 * return a Searchpath containing directories in which to look for
 	 * MIDI patch files ("*.midnam") aka MIDNAM files
 	 *
-	 * If ARDOUR_MIDI_PATCH_PATH is defined then the SearchPath returned
+	 * If ARDOUR_MIDI_PATCH_PATH is defined then the Searchpath returned
 	 * will contain only those directories specified in it, otherwise it will
 	 * contain the user and system directories which may contain control
 	 * surface plugins.
 	 */
-	PBD::SearchPath midi_patch_search_path ();
+	PBD::Searchpath midi_patch_search_path ();
 
 } // namespace ARDOUR
 
diff --git a/libs/ardour/ardour/panner_search_path.h b/libs/ardour/ardour/panner_search_path.h
index 889b9efb23..23004223b4 100644
--- a/libs/ardour/ardour/panner_search_path.h
+++ b/libs/ardour/ardour/panner_search_path.h
@@ -24,15 +24,15 @@
 namespace ARDOUR {
 
 	/**
-	 * return a SearchPath containing directories in which to look for
+	 * return a Searchpath containing directories in which to look for
 	 * panner plugins.
 	 *
-	 * If ARDOUR_PANNER_PATH is defined then the SearchPath returned
+	 * If ARDOUR_PANNER_PATH is defined then the Searchpath returned
 	 * will contain only those directories specified in it, otherwise it will
 	 * contain the user and system directories which may contain control
 	 * surface plugins.
 	 */
-	PBD::SearchPath panner_search_path ();
+	PBD::Searchpath panner_search_path ();
 
 } // namespace ARDOUR