ICU-9425 fixed issues with api docs

X-SVN-Rev: 32129

diff --git a/icu4c/source/Doxyfile.in b/icu4c/source/Doxyfile.in
index 14440caebb1bbe5cc455b68ef68cb0a528b3d5db..e3fa9c1f65c90a6ddfeb2ba95bc0b356a5d2c237 100644 (file)
--- a/icu4c/source/Doxyfile.in
+++ b/icu4c/source/Doxyfile.in
@@ -192,7 +192,7 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = 
 INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = U_EXPORT2= U_STABLE= U_DRAFT= U_INTERNAL= U_SYSTEM= U_DEPRECATED= U_OBSOLETE= U_CALLCONV= U_CDECL_BEGIN= U_CDECL_END=  U_NO_THROW= U_NAMESPACE_BEGIN= U_NAMESPACE_END= U_HAVE_STD_STRING=
+PREDEFINED             = U_EXPORT2= U_STABLE= U_DRAFT= U_INTERNAL= U_SYSTEM= U_DEPRECATED= U_OBSOLETE= U_CALLCONV= U_CDECL_BEGIN= U_CDECL_END=  U_NO_THROW=\ "U_NAMESPACE_BEGIN=namespace icu{" "U_NAMESPACE_END=}" U_HAVE_STD_STRING= U_SHOW_CPLUSPLUS_API=1 U_DEFINE_LOCAL_OPEN_POINTER()=
 EXPAND_AS_DEFINED      = 
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------

diff --git a/icu4c/source/common/unicode/docmain.h b/icu4c/source/common/unicode/docmain.h
index 05653161f22def2639938a432291ab0c26e6bf35..4b7fc3326730c832fe7e3bc11daa947ab82d3470 100644 (file)
--- a/icu4c/source/common/unicode/docmain.h
+++ b/icu4c/source/common/unicode/docmain.h
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
- * Copyright (c) 1997-2011, International Business Machines Corporation and
+ * Copyright (c) 1997-2012, International Business Machines Corporation and
  * others. All Rights Reserved.
  *
  *  FILE NAME: DOCMAIN.h
@@ -69,7 +69,7 @@
  *   <tr>
  *     <td>Strings and Character Iteration</td>
  *     <td>ustring.h, utf8.h, utf16.h, UText, UCharIterator</td>
- *     <td>UnicodeString, CharacterIterator, Appendable, StringPiece, ByteSink</td>
+ *     <td>icu::UnicodeString, icu::CharacterIterator, icu::Appendable, icu::StringPiece,icu::ByteSink</td>
  *   </tr>
  *   <tr>
  *     <td>Unicode Character<br>Properties and Names</td>
@@ -79,12 +79,12 @@
  *   <tr>
  *     <td>Sets of Unicode Code Points and Strings</td>
  *     <td>uset.h</td>
- *     <td>UnicodeSet</td>
+ *     <td>icu::UnicodeSet</td>
  *   </tr>
  *   <tr>
  *     <td>Maps from Strings to Integer Values</td>
  *     <td>(no C API)</td>
- *     <td>BytesTrie, UCharsTrie</td>
+ *     <td>icu::BytesTrie, icu::UCharsTrie</td>
  *   </tr>
  *   <tr>
  *     <td>Codepage Conversion</td>
@@ -99,47 +99,47 @@
  *   <tr>
  *     <td>Locales </td>
  *     <td>uloc.h</a></td>
- *     <td>Locale</td>
+ *     <td>icu::Locale</td>
  *   </tr>
  *   <tr>
  *     <td>Resource Bundles</td>
  *     <td>ures.h</td>
- *     <td>ResourceBundle</td>
+ *     <td>icu::ResourceBundle</td>
  *   </tr>
  *   <tr>
  *     <td>Normalization</td>
  *     <td>unorm2.h</td>
- *     <td>Normalizer2</td>
+ *     <td>icu::Normalizer2</td>
  *   </tr>
  *   <tr>
  *     <td>Calendars</td>
  *     <td>ucal.h</td>
- *     <td>Calendar</td>
+ *     <td>icu::Calendar</td>
  *   </tr>
  *   <tr>
  *     <td>Date and Time Formatting</td>
  *     <td>udat.h</td>
- *     <td>DateFormat</td>
+ *     <td>icu::DateFormat</td>
  *   </tr>
  *   <tr>
  *     <td>Message Formatting</td>
  *     <td>umsg.h</td>
- *     <td>MessageFormat</td>
+ *     <td>icu::MessageFormat</td>
  *   </tr>
  *   <tr>
  *     <td>Number Formatting</td>
  *     <td>unum.h</td>
- *     <td>NumberFormat</td>
+ *     <td>icu::NumberFormat</td>
  *   </tr>
  *   <tr>
  *     <td>Number Spellout<br>(Rule Based Number Formatting)</td>
  *     <td>unum.h<br>(use UNUM_SPELLOUT)</td>
- *     <td>RuleBasedNumberFormat</td>
+ *     <td>icu::RuleBasedNumberFormat</td>
  *   </tr>
  *   <tr>
  *     <td>Text Transformation<br>(Transliteration)</td>
  *     <td>utrans.h</td>
- *     <td>Transliterator</td>
+ *     <td>icu::Transliterator</td>
  *   </tr>
  *   <tr>
  *     <td>Bidirectional Algorithm</td>
@@ -154,27 +154,27 @@
  *   <tr>
  *     <td>Collation</td>
  *     <td>ucol.h</td>
- *     <td>Collator</td>
+ *     <td>icu::Collator</td>
  *   </tr>
  *   <tr>
  *     <td>String Searching</td>
  *     <td>usearch.h</td>
- *     <td>StringSearch</td>
+ *     <td>icu::StringSearch</td>
  *   </tr>
  *   <tr>
  *     <td>Index Characters/<br>Bucketing for Sorted Lists</td>
  *     <td>(no C API)</td>
- *     <td>AlphabeticIndex</td>
+ *     <td>icu::AlphabeticIndex</td>
  *   </tr>
  *   <tr>
  *     <td>Text Boundary Analysis<br>(Break Iteration)</td>
  *     <td>ubrk.h</td>
- *     <td>BreakIterator</td>
+ *     <td>icu::BreakIterator</td>
  *   </tr>
  *   <tr>
  *     <td>Regular Expressions</td>
  *     <td>uregex.h</td>
- *     <td>RegexPattern, RegexMatcher</td>
+ *     <td>icu::RegexPattern, icu::RegexMatcher</td>
  *   </tr>
  *   <tr>
  *     <td>StringPrep</td>
@@ -199,7 +199,7 @@
  *   <tr>
  *     <td>Layout Engine/Complex Text Layout</td>
  *     <td>loengine.h</td>
- *     <td>LayoutEngine, ParagraphLayout</td>
+ *     <td>icu::LayoutEngine,icu::ParagraphLayout</td>
  *   </tr>
  *   <tr>
  *     <td>ICU I/O</td>