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. --- gtk2_ardour/about.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'gtk2_ardour/about.cc') diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index b2dac67379..b656c29ad8 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -40,10 +40,6 @@ #include "i18n.h" -#ifdef SearchPath -#undef SearchPath -#endif - using namespace Gtk; using namespace Gdk; using namespace std; @@ -564,7 +560,7 @@ About::About () std::string splash_file; - SearchPath spath(ardour_data_search_path()); + Searchpath spath(ardour_data_search_path()); if (find_file_in_search_path (spath, "splash.png", splash_file)) { set_logo (Gdk::Pixbuf::create_from_file (splash_file)); -- cgit v1.2.3