From 8ddd12a60d08d895cb5400013cdda2e893fb81bb Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Thu, 15 Aug 2013 20:04:08 +1000 Subject: 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. --- libs/ardour/filesystem_paths.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libs/ardour/filesystem_paths.cc') diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc index 8d48ea3068..54f7508b65 100644 --- a/libs/ardour/filesystem_paths.cc +++ b/libs/ardour/filesystem_paths.cc @@ -101,7 +101,7 @@ ardour_dll_directory () } #ifdef PLATFORM_WINDOWS -SearchPath +Searchpath windows_search_path () { std::string dll_dir_path(g_win32_get_package_installation_directory_of_module(NULL)); @@ -110,10 +110,10 @@ windows_search_path () } #endif -SearchPath +Searchpath ardour_config_search_path () { - static SearchPath search_path; + static Searchpath search_path; if (search_path.empty()) { search_path += user_config_directory(); @@ -126,17 +126,17 @@ ardour_config_search_path () ::exit (1); } - search_path += SearchPath (s); + search_path += Searchpath (s); #endif } return search_path; } -SearchPath +Searchpath ardour_data_search_path () { - static SearchPath search_path; + static Searchpath search_path; if (search_path.empty()) { search_path += user_config_directory(); @@ -149,7 +149,7 @@ ardour_data_search_path () ::exit (1); } - search_path += SearchPath (s); + search_path += Searchpath (s); #endif } -- cgit v1.2.3