fix build on nightly

Author: korli

source/StationFinder.cpp

@@ -114,7 +114,11 @@ StationFinderService::StationFinderService()
 	: serviceName("unknown"),
 	  serviceHomePage(""),
 	  serviceLogo(NULL),
+#if B_HAIKU_VERSION > B_HAIKU_VERSION_1_BETA_5
+	  findByCapabilities(5)
+#else
 	  findByCapabilities(5, true)
+#endif
 {
 }
 
@@ -451,7 +455,7 @@ StationFinderWindow::DoSearch(const char* text)
 
 	be_app->SetCursor(new BCursor(B_CURSOR_ID_PROGRESS));
 
-	BObjectList<Station>* result = fCurrentService->FindBy(fDdSearchBy->Value(), text, this);
+	StationList* result = fCurrentService->FindBy(fDdSearchBy->Value(), text, this);
 	if (result != NULL) {
 		for (int32 i = 0; i < result->CountItems(); i++)
 			fResultView->AddItem(new StationListViewItem(result->ItemAt(i)));

source/StationFinder.h

@@ -50,6 +50,12 @@
 #define RES_BN_SEARCH 10
 
 
+#if B_HAIKU_VERSION > B_HAIKU_VERSION_1_BETA_5
+typedef BObjectList<Station, true>	StationList;
+#else
+typedef BObjectList<Station>	StationList;
+#endif
+
 typedef class StationFinderService* (*InstantiateFunc)();
 
 
@@ -97,7 +103,7 @@ class StationFinderService {
 	static void RegisterSelf();
 	static StationFinderService* Instantiate();
 
-	virtual BObjectList<Station>* FindBy(
+	virtual StationList* FindBy(
 		int capabilityIndex, const char* searchFor, BLooper* resultUpdateTarget)
 		= 0;
 
@@ -114,7 +120,11 @@ class StationFinderService {
 	BString serviceName;
 	BUrl serviceHomePage;
 	BBitmap* serviceLogo;
+#if B_HAIKU_VERSION > B_HAIKU_VERSION_1_BETA_5
+	BObjectList<FindByCapability, true> findByCapabilities;
+#else
 	BObjectList<FindByCapability> findByCapabilities;
+#endif
 
 	// Helper functions
 	BBitmap* RetrieveLogo(BUrl url);

source/StationFinderListenLive.cpp

@@ -154,7 +154,7 @@ StationFinderListenLive::~StationFinderListenLive()
 }
 
 
-BObjectList<Station>*
+StationList*
 StationFinderListenLive::FindBy(
 	int capabilityIndex, const char* searchFor, BLooper* resultUpdateTarget)
 {
@@ -164,7 +164,7 @@ StationFinderListenLive::FindBy(
 	fPlsLookupList.MakeEmpty(false);
 	fLookupNotify = resultUpdateTarget;
 
-	BObjectList<Station>* result = NULL;
+	StationList* result = NULL;
 
 	BString urlString(kBaseUrl);
 	strlwr((char*)searchFor);
@@ -202,10 +202,14 @@ StationFinderListenLive::FindBy(
 }
 
 
-BObjectList<Station>*
+StationList*
 StationFinderListenLive::ParseCountryReturn(BMallocIO* data, const char* searchFor)
 {
-	BObjectList<Station>* result = new BObjectList<Station>(20, true);
+#if B_HAIKU_VERSION > B_HAIKU_VERSION_1_BETA_5
+	StationList* result = new StationList(20);
+#else
+	StationList* result = new StationList(20, true);
+#endif
 	if (result == NULL)
 		return result;
 
@@ -286,10 +290,14 @@ StationFinderListenLive::ParseCountryReturn(BMallocIO* data, const char* searchF
 }
 
 
-BObjectList<Station>*
+StationList*
 StationFinderListenLive::ParseGenreReturn(BMallocIO* data, const char* searchFor)
 {
-	BObjectList<Station>* result = new BObjectList<Station>(20, true);
+#if B_HAIKU_VERSION > B_HAIKU_VERSION_1_BETA_5
+	StationList* result = new StationList(20);
+#else
+	StationList* result = new StationList(20, true);
+#endif
 	if (result == NULL)
 		return result;
 

source/StationFinderListenLive.h

@@ -31,11 +31,11 @@ class StationFinderListenLive : public StationFinderService {
 	static void RegisterSelf();
 	static StationFinderService* Instantiate();
 
-	virtual BObjectList<Station>* FindBy(
+	virtual StationList* FindBy(
 		int capabilityIndex, const char* searchFor, BLooper* resultUpdateTarget);
 
-	BObjectList<Station>* ParseCountryReturn(BMallocIO* data, const char* country);
-	BObjectList<Station>* ParseGenreReturn(BMallocIO* data, const char* genre);
+	StationList* ParseCountryReturn(BMallocIO* data, const char* country);
+	StationList* ParseGenreReturn(BMallocIO* data, const char* genre);
 
 private:
 	static int32 _PlsLookupFunc(void* data);

source/StationFinderRadioNetwork.cpp

@@ -48,7 +48,11 @@ IconLookup::IconLookup(Station* station, BUrl iconUrl)
 StationFinderRadioNetwork::StationFinderRadioNetwork()
 	: StationFinderService(),
 	  fIconLookupThread(-1),
+#if B_HAIKU_VERSION > B_HAIKU_VERSION_1_BETA_5
+	  fIconLookupList(100)
+#else
 	  fIconLookupList(100, true)
+#endif
 {
 	serviceName.SetTo(B_TRANSLATE("Community Radio Browser"));
 	serviceHomePage.SetUrlString("https://www.radio-browser.info");
@@ -84,7 +88,7 @@ StationFinderRadioNetwork::RegisterSelf()
 }
 
 
-BObjectList<Station>*
+StationList*
 StationFinderRadioNetwork::FindBy(
 	int capabilityIndex, const char* searchFor, BLooper* resultUpdateTarget)
 {
@@ -93,7 +97,7 @@ StationFinderRadioNetwork::FindBy(
 	fIconLookupList.MakeEmpty(true);
 	fIconLookupNotify = resultUpdateTarget;
 
-	BObjectList<Station>* result = new BObjectList<Station>();
+	StationList* result = new StationList();
 	if (result == NULL)
 		return result;
 

source/StationFinderRadioNetwork.h

@@ -39,7 +39,7 @@ class StationFinderRadioNetwork : public StationFinderService {
 	static void RegisterSelf();
 	static StationFinderService* Instantiate();
 
-	virtual BObjectList<Station>* FindBy(
+	virtual StationList* FindBy(
 		int capabilityIndex, const char* searchFor, BLooper* resultUpdateTarget);
 
 private:
@@ -52,7 +52,11 @@ class StationFinderRadioNetwork : public StationFinderService {
 	static BString sCachedServerUrl;
 
 	thread_id fIconLookupThread;
+#if B_HAIKU_VERSION > B_HAIKU_VERSION_1_BETA_5
+	BObjectList<IconLookup, true> fIconLookupList;
+#else
 	BObjectList<IconLookup> fIconLookupList;
+#endif
 	BLooper* fIconLookupNotify;
 };