From 81fe5a9200d8b5b8509206f0f0fb85492946c113 Mon Sep 17 00:00:00 2001
From: Oliver Tappe <zooey@hirschkaefer.de>
Date: Sat, 28 Aug 2010 09:23:26 +0000
Subject: [PATCH] * re-added GetAvailableTimeZones() to BCountry - it is now a
 convenience wrapper   around BLocaleRoster::GetAvailableTimeZonesForCountry()
 * minor cleanup

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38412 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/os/locale/Country.h |  3 ++-
 src/kits/locale/Country.cpp | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/headers/os/locale/Country.h b/headers/os/locale/Country.h
index a9a5c7f396..db88b139ab 100644
--- a/headers/os/locale/Country.h
+++ b/headers/os/locale/Country.h
@@ -43,7 +43,8 @@ public:
 
 			const char*			GetLocalizedString(uint32 id) const;
 
-								// measurements
+			status_t			GetAvailableTimeZones(
+									BMessage* timeZones) const;
 
 			int8				Measurement() const;
 
diff --git a/src/kits/locale/Country.cpp b/src/kits/locale/Country.cpp
index 720441c484..5d75ba1521 100644
--- a/src/kits/locale/Country.cpp
+++ b/src/kits/locale/Country.cpp
@@ -10,11 +10,10 @@
 #include <AutoDeleter.h>
 #include <IconUtils.h>
 #include <List.h>
+#include <LocaleRoster.h>
 #include <Resources.h>
 #include <String.h>
-#include <TimeZone.h>
 
-#include <unicode/datefmt.h>
 #include <unicode/locid.h>
 #include <unicode/ulocdata.h>
 #include <ICUWrapper.h>
@@ -110,6 +109,13 @@ BCountry::GetIcon(BBitmap* result) const
 }
 
 
+status_t
+BCountry::GetAvailableTimeZones(BMessage* timeZones) const
+{
+	return be_locale_roster->GetAvailableTimeZonesForCountry(timeZones, Code());
+}
+
+
 // TODO does ICU even support this ? Is it in the keywords ?
 int8
 BCountry::Measurement() const