X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b331163bffd790ced0e88b73f44f86d49ccc48a5..HEAD:/icuSources/i18n/unicode/scientificnumberformatter.h

diff --git a/icuSources/i18n/unicode/scientificnumberformatter.h b/icuSources/i18n/unicode/scientificnumberformatter.h
index 700694cd..7f860d4f 100644
--- a/icuSources/i18n/unicode/scientificnumberformatter.h
+++ b/icuSources/i18n/unicode/scientificnumberformatter.h
@@ -1,6 +1,8 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 **********************************************************************
-* Copyright (c) 2014, International Business Machines
+* Copyright (c) 2014-2016, International Business Machines
 * Corporation and others.  All Rights Reserved.
 **********************************************************************
 */
@@ -9,9 +11,10 @@
 
 #include "unicode/utypes.h"
 
+#if U_SHOW_CPLUSPLUS_API
+
 #if !UCONFIG_NO_FORMATTING
 
-#ifndef U_HIDE_DRAFT_API
 
 #include "unicode/unistr.h"
 
@@ -23,7 +26,6 @@
 U_NAMESPACE_BEGIN
 
 class FieldPositionIterator;
-class DecimalFormatStaticSets;
 class DecimalFormatSymbols;
 class DecimalFormat;
 class Formattable;
@@ -45,7 +47,7 @@ class Formattable;
  * fmt->format(1.23456e-78, appendTo, status);
  * </pre>
  *
- * @draft ICU 55
+ * @stable ICU 55
  */
 class U_I18N_API ScientificNumberFormatter : public UObject {
 public:
@@ -58,7 +60,7 @@ public:
      * @param status error returned here.
      * @return The new ScientificNumberFormatter instance.
      *
-     * @draft ICU 55
+     * @stable ICU 55
      */
     static ScientificNumberFormatter *createSuperscriptInstance(
             DecimalFormat *fmtToAdopt, UErrorCode &status);
@@ -70,7 +72,7 @@ public:
      * @param status error returned here.
      * @return The ScientificNumberFormatter instance.
      *
-     * @draft ICU 55
+     * @stable ICU 55
      */
     static ScientificNumberFormatter *createSuperscriptInstance(
             const Locale &locale, UErrorCode &status);
@@ -86,7 +88,7 @@ public:
      * @param status error returned here.
      * @return The new ScientificNumberFormatter instance.
      *
-     * @draft ICU 55
+     * @stable ICU 55
      */
     static ScientificNumberFormatter *createMarkupInstance(
             DecimalFormat *fmtToAdopt,
@@ -103,7 +105,7 @@ public:
      * @param status error returned here.
      * @return The ScientificNumberFormatter instance.
      *
-     * @draft ICU 55
+     * @stable ICU 55
      */
     static ScientificNumberFormatter *createMarkupInstance(
             const Locale &locale,
@@ -114,7 +116,7 @@ public:
 
     /**
      * Returns a copy of this object. Caller must free returned copy.
-     * @draft ICU 55
+     * @stable ICU 55
      */
     ScientificNumberFormatter *clone() const {
         return new ScientificNumberFormatter(*this);
@@ -122,7 +124,7 @@ public:
 
     /**
      * Destructor.
-     * @draft ICU 55
+     * @stable ICU 55
      */
     virtual ~ScientificNumberFormatter();
 
@@ -134,7 +136,7 @@ public:
      * @param status any error returned here.
      * @return appendTo
      *
-     * @draft ICU 55
+     * @stable ICU 55
      */
     UnicodeString &format(
             const Formattable &number,
@@ -149,7 +151,6 @@ public:
                 const UnicodeString &original,
                 FieldPositionIterator &fpi,
                 const UnicodeString &preExponent,
-                const DecimalFormatStaticSets &decimalFormatSets,
                 UnicodeString &appendTo,
                 UErrorCode &status) const = 0;
     private:
@@ -158,13 +159,12 @@ public:
 
     class U_I18N_API SuperscriptStyle : public Style {
     public:
-        virtual Style *clone() const;
+        virtual SuperscriptStyle *clone() const;
     protected:
         virtual UnicodeString &format(
                 const UnicodeString &original,
                 FieldPositionIterator &fpi,
                 const UnicodeString &preExponent,
-                const DecimalFormatStaticSets &decimalFormatSets,
                 UnicodeString &appendTo,
                 UErrorCode &status) const;
     };
@@ -177,13 +177,12 @@ public:
                 : Style(),
                   fBeginMarkup(beginMarkup),
                   fEndMarkup(endMarkup) { }
-        virtual Style *clone() const;
+        virtual MarkupStyle *clone() const;
     protected:
         virtual UnicodeString &format(
                 const UnicodeString &original,
                 FieldPositionIterator &fpi,
                 const UnicodeString &preExponent,
-                const DecimalFormatStaticSets &decimalFormatSets,
                 UnicodeString &appendTo,
                 UErrorCode &status) const;
     private:
@@ -210,13 +209,14 @@ public:
     UnicodeString fPreExponent;
     DecimalFormat *fDecimalFormat;
     Style *fStyle;
-    const DecimalFormatStaticSets *fStaticSets;
 
 };
 
 U_NAMESPACE_END
 
-#endif /* U_HIDE_DRAFT_API */
 
 #endif /* !UCONFIG_NO_FORMATTING */
+
+#endif /* U_SHOW_CPLUSPLUS_API */
+
 #endif