ICU-66108.tar.gz

[apple/icu.git] / icuSources / i18n / windtfmt.h

diff --git a/icuSources/i18n/windtfmt.h b/icuSources/i18n/windtfmt.h
index 39ac8afb62093ff62ab4e9f703e1158710dcff1a..7fe7f68f450e840e721905400bba1a7da412fa25 100644 (file)
--- a/icuSources/i18n/windtfmt.h
+++ b/icuSources/i18n/windtfmt.h
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
 ********************************************************************************
 /*
 ********************************************************************************

-*   Copyright (C) 2005-2011, International Business Machines
+*   Copyright (C) 2005-2015, International Business Machines

 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *
 *   Corporation and others.  All Rights Reserved.
 ********************************************************************************
 *


@@ -14,7 +16,7 @@
 
 #include "unicode/utypes.h"
 
 
 #include "unicode/utypes.h"
 

-#if U_PLATFORM_HAS_WIN32_API
+#if U_PLATFORM_USES_ONLY_WIN32_API

 
 #if !UCONFIG_NO_FORMATTING
 
 
 #if !UCONFIG_NO_FORMATTING
 


@@ -46,13 +48,13 @@ public:
 
     virtual ~Win32DateFormat();
 
 
     virtual ~Win32DateFormat();
 

-    virtual Format *clone(void) const;
+    virtual Win32DateFormat *clone() const;

 
     Win32DateFormat &operator=(const Win32DateFormat &other);
 
     UnicodeString &format(Calendar &cal, UnicodeString &appendTo, FieldPosition &pos) const;
 
 
     Win32DateFormat &operator=(const Win32DateFormat &other);
 
     UnicodeString &format(Calendar &cal, UnicodeString &appendTo, FieldPosition &pos) const;
 

-    UnicodeString& format(UDate date, UnicodeString& appendTo) const;
+    using DateFormat::format;

 
     void parse(const UnicodeString& text, Calendar& cal, ParsePosition& pos) const;
 
 
     void parse(const UnicodeString& text, Calendar& cal, ParsePosition& pos) const;
 


@@ -93,7 +95,7 @@ public:
      * <pre>
      * .   Base* polymorphic_pointer = createPolymorphicObject();
      * .   if (polymorphic_pointer->getDynamicClassID() ==
      * <pre>
      * .   Base* polymorphic_pointer = createPolymorphicObject();
      * .   if (polymorphic_pointer->getDynamicClassID() ==

-     * .       erived::getStaticClassID()) ...
+     * .       derived::getStaticClassID()) ...

      * </pre>
      * @return          The class ID for all objects of this class.
      */
      * </pre>
      * @return          The class ID for all objects of this class.
      */


@@ -121,20 +123,17 @@ private:
     UnicodeString *fDateTimeMsg;
     DateFormat::EStyle fTimeStyle;
     DateFormat::EStyle fDateStyle;
     UnicodeString *fDateTimeMsg;
     DateFormat::EStyle fTimeStyle;
     DateFormat::EStyle fDateStyle;

-    const Locale *fLocale;
-    int32_t fLCID;
+    Locale fLocale;

     UnicodeString fZoneID;
     TIME_ZONE_INFORMATION *fTZI;
     UnicodeString fZoneID;
     TIME_ZONE_INFORMATION *fTZI;

-};

 
 

-inline UnicodeString &Win32DateFormat::format(UDate date, UnicodeString& appendTo) const {
-    return DateFormat::format(date, appendTo);
-}
+    UnicodeString* fWindowsLocaleName; // Stores the equivalent Windows locale name.
+};

 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 

-#endif // U_PLATFORM_HAS_WIN32_API
+#endif // U_PLATFORM_USES_ONLY_WIN32_API

 
 #endif // __WINDTFMT
 
 #endif // __WINDTFMT