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.

1 files changed, 6 insertions, 10 deletions

diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc
index faecdc6e63..b912fdc446 100644
--- a/libs/ardour/template_utils.cc
+++ b/libs/ardour/template_utils.cc
@@ -32,27 +32,23 @@
 #include "ardour/filename_extensions.h"
 #include "ardour/io.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
 using namespace std;
 using namespace PBD;
 
 namespace ARDOUR {
 
-SearchPath
+Searchpath
 template_search_path ()
 {
-	SearchPath spath (ardour_data_search_path());
+	Searchpath spath (ardour_data_search_path());
 	spath.add_subdirectory_to_paths(templates_dir_name);
 	return spath;
 }
 
-SearchPath
+Searchpath
 route_template_search_path ()
 {
-	SearchPath spath (ardour_data_search_path());
+	Searchpath spath (ardour_data_search_path());
 	spath.add_subdirectory_to_paths(route_templates_dir_name);
 	return spath;
 }
@@ -101,7 +97,7 @@ find_session_templates (vector<TemplateInfo>& template_names)
 {
 	vector<string *> *templates;
 	PathScanner scanner;
-	SearchPath spath (template_search_path());
+	Searchpath spath (template_search_path());
 
 	templates = scanner (spath.to_string(), template_filter, 0, true, true);
 
@@ -137,7 +133,7 @@ find_route_templates (vector<TemplateInfo>& template_names)
 {
 	vector<string *> *templates;
 	PathScanner scanner;
-	SearchPath spath (route_template_search_path());
+	Searchpath spath (route_template_search_path());
 
 	templates = scanner (spath.to_string(), route_template_filter, 0, false, true);