X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b331163bffd790ced0e88b73f44f86d49ccc48a5..38fbf2fd31f5cd99b500914d6037b1d06b608645:/icuSources/i18n/unicode/tznames.h

diff --git a/icuSources/i18n/unicode/tznames.h b/icuSources/i18n/unicode/tznames.h
index 9583ded0..89cd2b53 100644
--- a/icuSources/i18n/unicode/tznames.h
+++ b/icuSources/i18n/unicode/tznames.h
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
-* Copyright (C) 2011-2014, International Business Machines Corporation and
+* Copyright (C) 2011-2016, International Business Machines Corporation and
 * others. All Rights Reserved.
 *******************************************************************************
 */
@@ -69,6 +71,7 @@ typedef enum UTimeZoneNameType {
 
 U_CDECL_END
 
+#if U_SHOW_CPLUSPLUS_API
 U_NAMESPACE_BEGIN
 
 class UVector;
@@ -133,7 +136,7 @@ public:
     virtual ~TimeZoneNames();
 
     /**
-     * Return true if the given TimeZoneNames objects are emantically equal.
+     * Return true if the given TimeZoneNames objects are semantically equal.
      * @param other the object to be compared with.
      * @return Return TRUE if the given Format objects are semantically equal.
      * @stable ICU 50
@@ -167,7 +170,6 @@ public:
      */
     static TimeZoneNames* U_EXPORT2 createInstance(const Locale& locale, UErrorCode& status);
 
-#ifndef U_HIDE_DRAFT_API
     /**
      * Returns an instance of <code>TimeZoneNames</code> containing only short specific
      * zone names (SHORT_STANDARD and SHORT_DAYLIGHT),
@@ -176,10 +178,9 @@ public:
      * Note: The input locale is used for resolving ambiguous names (e.g. "IST" is parsed
      * as Israel Standard Time for Israel, while it is parsed as India Standard Time for
      * all other regions). The zone names returned by this instance are not localized.
-     * @draft ICU 54
+     * @stable ICU 54
      */
      static TimeZoneNames* U_EXPORT2 createTZDBInstance(const Locale& locale, UErrorCode& status);
-#endif /* U_HIDE_DRAFT_API */
 
     /**
      * Returns an enumeration of all available meta zone IDs.
@@ -290,6 +291,18 @@ public:
      */
     virtual UnicodeString& getDisplayName(const UnicodeString& tzID, UTimeZoneNameType type, UDate date, UnicodeString& name) const;
 
+    /**
+     * @internal For specific users only until proposed publicly.
+     * @deprecated This API is ICU internal only.
+     */
+    virtual void loadAllDisplayNames(UErrorCode& status);
+
+    /**
+     * @internal For specific users only until proposed publicly.
+     * @deprecated This API is ICU internal only.
+     */
+    virtual void getDisplayNames(const UnicodeString& tzID, const UTimeZoneNameType types[], int32_t numTypes, UDate date, UnicodeString dest[], UErrorCode& status) const;
+
     /**
      * <code>MatchInfoCollection</code> represents a collection of time zone name matches used by
      * {@link TimeZoneNames#find}.
@@ -399,6 +412,7 @@ public:
 };
 
 U_NAMESPACE_END
+#endif // U_SHOW_CPLUSPLUS_API
 
 #endif
 #endif