summaryrefslogtreecommitdiff
path: root/libs/ardour/filesystem_paths.cc
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2013-08-15 20:04:08 +1000
committerTim Mayberry <mojofunk@gmail.com>2013-09-06 14:31:11 +1000
commit8ddd12a60d08d895cb5400013cdda2e893fb81bb (patch)
tree84c0082083295835e33c38c12acc5e21cb9b7c7e /libs/ardour/filesystem_paths.cc
parente6c7ecf0e369ba886a7dc57a195226921f0f11f1 (diff)
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.
Diffstat (limited to 'libs/ardour/filesystem_paths.cc')
-rw-r--r--libs/ardour/filesystem_paths.cc14
1 files changed, 7 insertions, 7 deletions
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
}