ICU-10740 Adjust #ifndef U_HIDE_DRAFT/INTERNAL_API for changes; don't use around default,copy,= ctors

X-SVN-Rev: 35478

icu4c/source/common/unicode/listformatter.h

@@ -63,7 +63,6 @@ class U_COMMON_API ListFormatter : public UObject{
 
   public:
 
-#ifndef U_HIDE_DRAFT_API
     /**
      * Copy constructor.
      * @draft ICU 52
@@ -75,7 +74,6 @@ class U_COMMON_API ListFormatter : public UObject{
      * @draft ICU 52
      */
     ListFormatter& operator=(const ListFormatter& other);
-#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Creates a ListFormatter appropriate for the default locale.

icu4c/source/common/unicode/stringtriebuilder.h

@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
-*   Copyright (C) 2010-2012, International Business Machines
+*   Copyright (C) 2010-2012,2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *   file name:  stringtriebuilder.h
@@ -162,6 +162,7 @@ protected:
      * @internal
      */
     Node *registerFinalValue(int32_t value, UErrorCode &errorCode);
+#endif  /* U_HIDE_INTERNAL_API */
 
     /*
      * C++ note:
@@ -183,6 +184,7 @@ protected:
     /** @internal */
     UHashtable *nodes;
 
+#ifndef U_HIDE_INTERNAL_API
     /** @internal */
     class Node : public UObject {
     public:

icu4c/source/common/unicode/ures.h

@@ -1,6 +1,6 @@
 /*
 **********************************************************************
-*   Copyright (C) 1997-2012, International Business Machines
+*   Copyright (C) 1997-2012,2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 **********************************************************************
 *
@@ -230,6 +230,7 @@ ures_countArrayItems(const UResourceBundle* resourceBundle,
                      const char* resourceKey,
                      UErrorCode* err);
 #endif  /* U_HIDE_DEPRECATED_API */
+
 /**
  * Close a resource bundle, all pointers returned from the various ures_getXXX calls
  * on this particular bundle should be considered invalid henceforth.

icu4c/source/i18n/unicode/measfmt.h

@@ -111,6 +111,7 @@ class U_I18N_API MeasureFormat : public Format {
             UMeasureFormatWidth width,
             NumberFormat *nfToAdopt,
             UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
 
     /**
      * Copy constructor.
@@ -124,8 +125,6 @@ class U_I18N_API MeasureFormat : public Format {
      */
     MeasureFormat &operator=(const MeasureFormat &rhs);
 
-#endif /* U_HIDE_DRAFT_API */
-    
     /**
      * Destructor.
      * @stable ICU 3.0

icu4c/source/i18n/unicode/measunit.h

@@ -44,7 +44,6 @@ class U_I18N_API MeasureUnit: public UObject {
         fCurrency[0] = 0;
     }
     
-#ifndef U_HIDE_DRAFT_API
     /**
      * Copy constructor.
      * @draft ICU 53
@@ -56,7 +55,6 @@ class U_I18N_API MeasureUnit: public UObject {
      * @draft ICU 53
      */
     MeasureUnit &operator=(const MeasureUnit &other);
-#endif /* U_HIDE_DRAFT_API */
 
     /**
      * Returns a polymorphic clone of this object.  The result will
@@ -172,7 +170,6 @@ class U_I18N_API MeasureUnit: public UObject {
     virtual UClassID getDynamicClassID(void) const;
 
 #ifndef U_HIDE_INTERNAL_API
-
     /**
      * ICU use only.
      * Returns associated array index for this measure unit. Only valid for
@@ -187,11 +184,11 @@ class U_I18N_API MeasureUnit: public UObject {
      * @internal
      */
     static int32_t getIndexCount();
-
 #endif /* U_HIDE_INTERNAL_API */
 
 // Start generated createXXX methods
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Creates a unit of acceleration: g-force.
      * Caller owns returned value and must free it.
@@ -559,6 +556,7 @@ class U_I18N_API MeasureUnit: public UObject {
      * @draft ICU 53
      */
     static MeasureUnit *createLiter(UErrorCode &status);
+#endif /* U_HIDE_DRAFT_API */
 
  protected:
 

icu4c/source/i18n/unicode/region.h

@@ -101,11 +101,13 @@ public:
      */
     static const Region* U_EXPORT2 getInstance (int32_t code, UErrorCode &status);
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Returns an enumeration over the IDs of all known regions that match the given type.
      * @draft ICU 51
      */
     static StringEnumeration* U_EXPORT2 getAvailable(URegionType type);
+#endif /* U_HIDE_DRAFT_API */
    
     /**
      * Returns a pointer to the region that contains this region.  Returns NULL if this region is code "001" (World)
@@ -125,6 +127,7 @@ public:
      */
     const Region* getContainingRegion(URegionType type) const;
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * Return an enumeration over the IDs of all the regions that are immediate children of this region in the
      * region hierarchy. These returned regions could be either macro regions, territories, or a mixture of the two,
@@ -144,6 +147,7 @@ public:
      * @draft ICU 51 
      */
     StringEnumeration* getContainedRegions( URegionType type ) const;
+#endif /* U_HIDE_DRAFT_API */
  
     /**
      * Returns true if this region contains the supplied other region anywhere in the region hierarchy.
@@ -151,6 +155,7 @@ public:
      */
     UBool contains(const Region &other) const;
 
+#ifndef U_HIDE_DRAFT_API
     /**
      * For deprecated regions, return an enumeration over the IDs of the regions that are the preferred replacement
      * regions for this region.  Returns null for a non-deprecated region.  For example, calling this method with region
@@ -158,7 +163,7 @@ public:
      * @draft ICU 51 
      */
     StringEnumeration* getPreferredValues() const;
- 
+ #endif /* U_HIDE_DRAFT_API */
 
     /**
      * Return this region's canonical region code.

icu4c/source/i18n/unicode/tblcoll.h

@@ -164,6 +164,7 @@ public:
                     UColAttributeValue decompositionMode,
                     UErrorCode& status);
 
+#ifndef U_HIDE_INTERNAL_API 
     /**
      * TODO: document & propose as public API
      * @internal
@@ -171,6 +172,7 @@ public:
     RuleBasedCollator(const UnicodeString &rules,
                       UParseError &parseError, UnicodeString &reason,
                       UErrorCode &errorCode);
+#endif  /* U_HIDE_INTERNAL_API */
 
     /**
      * Copy constructor.

icu4c/source/i18n/unicode/tmutfmt.h

@@ -44,7 +44,7 @@ enum UTimeUnitFormatStyle {
 };
 typedef enum UTimeUnitFormatStyle UTimeUnitFormatStyle; /**< @deprecated ICU 53 */
 
-#endif
+#endif  /* U_HIDE_DEPRECATED_API */
 
 
 U_NAMESPACE_BEGIN

icu4c/source/i18n/unicode/unum.h

@@ -197,17 +197,19 @@ typedef enum UNumberFormatStyle {
      * @stable ICU 4.8
      */
     UNUM_CURRENCY_PLURAL,
+#ifndef U_HIDE_DRAFT_API
     /**
      * Currency format for accounting, e.g., "($3.00)" for
      * negative currency amount instead of "-$3.00" ({@link #UNUM_CURRENCY}).
      * @draft ICU 53
      */
-    UNUM_CURRENCY_ACCOUNTING,
+    UNUM_CURRENCY_ACCOUNTING = UNUM_CURRENCY_PLURAL+1,
+#endif /* U_HIDE_DRAFT_API */
     /**
      * One more than the highest number format style constant.
      * @stable ICU 4.8
      */
-    UNUM_FORMAT_STYLE_COUNT,
+    UNUM_FORMAT_STYLE_COUNT = UNUM_CURRENCY_PLURAL+2,
     /**
      * Default format
      * @stable ICU 2.0