Ticket #12057: icu-renaming.patch

File icu-renaming.patch, 10.9 KB (added by korli, 9 years ago)

use ICU renamed namespace

  • headers/os/locale/Collator.h 

    diff --git a/headers/os/locale/Collator.h b/headers/os/locale/Collator.h
index 861ccfe..2d6e84e 100644
    a b  
    99#include <Archivable.h>
    1010#include <SupportDefs.h>
    1111
    12 
    13 namespace icu {
     12#ifndef U_ICU_NAMESPACE
     13  #define U_ICU_NAMESPACE icu
     14#endif
     15namespace U_ICU_NAMESPACE {
    1416    class Collator;
    1517};
    1618
    … … public:  
    7375private:
    7476            status_t            _SetStrength(int8 strength) const;
    7577
    76             mutable icu::Collator*  fICUCollator;
     78            mutable U_ICU_NAMESPACE::Collator*  fICUCollator;
    7779            int8                fDefaultStrength;
    7880            bool                fIgnorePunctuation;
    7981};

  • headers/os/locale/Country.h 

    diff --git a/headers/os/locale/Country.h b/headers/os/locale/Country.h
index e8e9c92..681910e 100644
    a b class BBitmap;  
    1616class BLanguage;
    1717class BMessage;
    1818
    19 namespace icu {
     19#ifndef U_ICU_NAMESPACE
     20  #define U_ICU_NAMESPACE icu
     21#endif
     22namespace U_ICU_NAMESPACE {
    2023    class DateFormat;
    2124    class Locale;
    2225}
    … … public:  
    4548private:
    4649    friend  class Private;
    4750
    48             icu::Locale*        fICULocale;
     51            U_ICU_NAMESPACE::Locale*        fICULocale;
    4952};
    5053
    5154

  • headers/os/locale/DateFormat.h 

    diff --git a/headers/os/locale/DateFormat.h b/headers/os/locale/DateFormat.h
index 1eee1e8..76a0567 100644
    a b  
    1414#include <Locker.h>
    1515
    1616
    17 namespace icu {
     17#ifndef U_ICU_NAMESPACE
     18  #define U_ICU_NAMESPACE icu
     19#endif
     20namespace U_ICU_NAMESPACE {
    1821    class DateFormat;
    1922}
    2023
    … … public:  
    7679                                    BDate& output);
    7780
    7881private:
    79             icu::DateFormat*    _CreateDateFormatter(
     82            U_ICU_NAMESPACE::DateFormat*    _CreateDateFormatter(
    8083                                    const BDateFormatStyle style) const;
    8184
    8285};

  • headers/os/locale/DateTimeFormat.h 

    diff --git a/headers/os/locale/DateTimeFormat.h b/headers/os/locale/DateTimeFormat.h
index b7916cf..5a0e3a0 100644
    a b public:  
    5353                                    const BTimeZone* timeZone = NULL) const;
    5454
    5555private:
    56             icu::DateFormat*    _CreateDateTimeFormatter(
     56            U_ICU_NAMESPACE::DateFormat*    _CreateDateTimeFormatter(
    5757                                    const BString& format) const;
    5858};
    5959

  • headers/os/locale/DurationFormat.h 

    diff --git a/headers/os/locale/DurationFormat.h b/headers/os/locale/DurationFormat.h
index d1f226e..9a529ec 100644
    a b  
    1414
    1515class BTimeZone;
    1616
    17 namespace icu {
     17#ifndef U_ICU_NAMESPACE
     18  #define U_ICU_NAMESPACE icu
     19#endif
     20namespace U_ICU_NAMESPACE {
    1821    class GregorianCalendar;
    1922}
    2023
    … … public:  
    4346private:
    4447            BString             fSeparator;
    4548            BTimeUnitFormat     fTimeUnitFormat;
    46             icu::GregorianCalendar* fCalendar;
     49            U_ICU_NAMESPACE::GregorianCalendar* fCalendar;
    4750};
    4851
    4952

  • headers/os/locale/FormattingConventions.h 

    diff --git a/headers/os/locale/FormattingConventions.h b/headers/os/locale/FormattingConventions.h
index b526ef3..9a888f8 100644
    a b class BBitmap;  
    1717class BLanguage;
    1818class BMessage;
    1919
    20 namespace icu {
     20#ifndef U_ICU_NAMESPACE
     21  #define U_ICU_NAMESPACE icu
     22#endif
     23namespace U_ICU_NAMESPACE {
    2124    class DateFormat;
    2225    class Locale;
    2326}
    … … private:  
    137140
    138141            bool                fUseStringsFromPreferredLanguage;
    139142
    140             icu::Locale*        fICULocale;
     143            U_ICU_NAMESPACE::Locale*        fICULocale;
    141144};
    142145
    143146

  • headers/os/locale/Language.h 

    diff --git a/headers/os/locale/Language.h b/headers/os/locale/Language.h
index 133e798..6f1136e 100644
    a b class BBitmap;  
    1515
    1616// We must not include the icu headers in there as it could mess up binary
    1717// compatibility.
    18 namespace icu {
     18#ifndef U_ICU_NAMESPACE
     19  #define U_ICU_NAMESPACE icu
     20#endif
     21namespace U_ICU_NAMESPACE {
    1922    class Locale;
    2023}
    2124
    … … private:  
    6467    friend  class Private;
    6568
    6669            uint8               fDirection;
    67             icu::Locale*        fICULocale;
     70            U_ICU_NAMESPACE::Locale*        fICULocale;
    6871};
    6972
    7073

  • headers/os/locale/MessageFormat.h 

    diff --git a/headers/os/locale/MessageFormat.h b/headers/os/locale/MessageFormat.h
index eeaf978..38fb205 100644
    a b  
    1313#include <Format.h>
    1414
    1515
    16 namespace icu {
     16#ifndef U_ICU_NAMESPACE
     17  #define U_ICU_NAMESPACE icu
     18#endif
     19namespace U_ICU_NAMESPACE {
    1720    class MessageFormat;
    1821    class UnicodeString;
    1922}
    … … public:  
    3134            status_t            Format(BString& buffer, const int64 arg) const;
    3235
    3336private:
    34             status_t            _Initialize(const icu::UnicodeString&);
     37            status_t            _Initialize(const U_ICU_NAMESPACE::UnicodeString&);
    3538
    3639private:
    37             icu::MessageFormat* fFormatter;
     40            U_ICU_NAMESPACE::MessageFormat* fFormatter;
    3841};
    3942
    4043

  • headers/os/locale/TimeFormat.h 

    diff --git a/headers/os/locale/TimeFormat.h b/headers/os/locale/TimeFormat.h
index 9a1dc04..152b872 100644
    a b public:  
    4848                                    BPrivate::BTime& output);
    4949
    5050private:
    51             icu::DateFormat*    _CreateTimeFormatter(
     51            U_ICU_NAMESPACE::DateFormat*    _CreateTimeFormatter(
    5252                                    const BTimeFormatStyle style) const;
    5353};
    5454

  • headers/os/locale/TimeUnitFormat.h 

    diff --git a/headers/os/locale/TimeUnitFormat.h b/headers/os/locale/TimeUnitFormat.h
index d729efe..447284b 100644
    a b  
    1212
    1313class BString;
    1414
    15 namespace icu {
     15#ifndef U_ICU_NAMESPACE
     16  #define U_ICU_NAMESPACE icu
     17#endif
     18namespace U_ICU_NAMESPACE {
    1619    class TimeUnitFormat;
    1720}
    1821
    … … public:  
    5356                                    ) const;
    5457
    5558private:
    56             icu::TimeUnitFormat*    fFormatter;
     59            U_ICU_NAMESPACE::TimeUnitFormat*    fFormatter;
    5760};
    5861
    5962

  • headers/os/locale/TimeZone.h 

    diff --git a/headers/os/locale/TimeZone.h b/headers/os/locale/TimeZone.h
index ced9e90..f58f99d 100644
    a b  
    99#include <String.h>
    1010
    1111
    12 namespace icu {
     12#ifndef U_ICU_NAMESPACE
     13  #define U_ICU_NAMESPACE icu
     14#endif
     15namespace U_ICU_NAMESPACE {
    1316    class Locale;
    1417    class TimeZone;
    1518}
    … … public:  
    4649private:
    4750    friend  class Private;
    4851
    49             icu::TimeZone*      fICUTimeZone;
    50             icu::Locale*        fICULocale;
     52            U_ICU_NAMESPACE::TimeZone*      fICUTimeZone;
     53            U_ICU_NAMESPACE::Locale*        fICULocale;
    5154            status_t            fInitStatus;
    5255
    5356    mutable uint32              fInitializedFields;

  • src/kits/locale/Collator.cpp 

    diff --git a/src/kits/locale/Collator.cpp b/src/kits/locale/Collator.cpp
index 47d7f55..1f285cb 100644
    a b  
    44* Distributed under the terms of the MIT License.
    55*/
    66
     7#include <unicode/uversion.h>
     8#include <Collator.h>
    79
    810#include <ctype.h>
    911#include <stdlib.h>
    … …  
    1113#include <new>
    1214#include <typeinfo>
    1315
    14 #include <Collator.h>
    1516#include <UnicodeChar.h>
    1617#include <String.h>
    1718#include <Message.h>

  • src/kits/locale/Country.cpp 

    diff --git a/src/kits/locale/Country.cpp b/src/kits/locale/Country.cpp
index 8b67c9e..e95711d 100644
    a b  
    55 */
    66
    77
     8#include <unicode/uversion.h>
    89#include <Country.h>
    910
    1011#include <AutoDeleter.h>

  • src/kits/locale/DateFormat.cpp 

    diff --git a/src/kits/locale/DateFormat.cpp b/src/kits/locale/DateFormat.cpp
index ae067ab..6542c3b 100644
    a b  
    77 *      Adrien Desutugues <pulkomandy@pulkomandy.tk>
    88 */
    99
     10#include <unicode/uversion.h>
    1011#include <DateFormat.h>
    1112
    1213#include <AutoDeleter.h>

  • src/kits/locale/DateTimeFormat.cpp 

    diff --git a/src/kits/locale/DateTimeFormat.cpp b/src/kits/locale/DateTimeFormat.cpp
index 4e856ce..7172257 100644
    a b  
    66 *      Oliver Tappe <zooey@hirschkaefer.de>
    77 */
    88
     9#include <unicode/uversion.h>
    910#include <DateTimeFormat.h>
    1011
    1112#include <AutoDeleter.h>

  • src/kits/locale/DurationFormat.cpp 

    diff --git a/src/kits/locale/DurationFormat.cpp b/src/kits/locale/DurationFormat.cpp
index 1d11ced..9536480 100644
    a b  
    77 */
    88
    99
     10#include <unicode/uversion.h>
    1011#include <DurationFormat.h>
    1112
    1213#include <new>

  • src/kits/locale/FormattingConventions.cpp 

    diff --git a/src/kits/locale/FormattingConventions.cpp b/src/kits/locale/FormattingConventions.cpp
index 7535300..0ae512f 100644
    a b  
    66 */
    77
    88
     9#include <unicode/uversion.h>
    910#include <FormattingConventions.h>
    1011
    1112#include <AutoDeleter.h>

  • src/kits/locale/Language.cpp 

    diff --git a/src/kits/locale/Language.cpp b/src/kits/locale/Language.cpp
index 1b140c7..047f582 100644
    a b  
    44 */
    55
    66
     7#include <unicode/uversion.h>
    78#include <Language.h>
    89
    910#include <stdlib.h>

  • src/kits/locale/LocaleRoster.cpp 

    diff --git a/src/kits/locale/LocaleRoster.cpp b/src/kits/locale/LocaleRoster.cpp
index 748c988..1770960 100644
    a b  
    88 */
    99
    1010
     11#include <unicode/uversion.h>
    1112#include <LocaleRoster.h>
    1213
    1314#include <assert.h>

  • src/kits/locale/LocaleRosterData.cpp 

    diff --git a/src/kits/locale/LocaleRosterData.cpp b/src/kits/locale/LocaleRosterData.cpp
index 2efbc99..b1f9dfd 100644
    a b  
    88 */
    99
    1010
     11#include <unicode/uversion.h>
    1112#include <LocaleRosterData.h>
    1213
    1314#include <Autolock.h>

  • src/kits/locale/MessageFormat.cpp 

    diff --git a/src/kits/locale/MessageFormat.cpp b/src/kits/locale/MessageFormat.cpp
index 4c66e5a..274d4ac 100644
    a b  
    66 *      Adrien Destugues, pulkomandy@pulkomandy.tk
    77 *      John Scipione, jscipione@gmail.com
    88 */
     9
     10#include <unicode/uversion.h>
    911#include <MessageFormat.h>
    1012
    1113#include <Autolock.h>

  • src/kits/locale/NumberFormat.cpp 

    diff --git a/src/kits/locale/NumberFormat.cpp b/src/kits/locale/NumberFormat.cpp
index f6368af..fefd4a3 100644
    a b  
    66 */
    77
    88
     9#include <unicode/uversion.h>
    910#include <NumberFormat.h>
    1011
    1112#include <AutoDeleter.h>

  • src/kits/locale/TimeFormat.cpp 

    diff --git a/src/kits/locale/TimeFormat.cpp b/src/kits/locale/TimeFormat.cpp
index 4e258cb..55cc534 100644
    a b  
    66 *      Oliver Tappe <zooey@hirschkaefer.de>
    77 */
    88
     9#include <unicode/uversion.h>
    910#include <TimeFormat.h>
    1011
    1112#include <AutoDeleter.h>

  • src/kits/locale/TimeUnitFormat.cpp 

    diff --git a/src/kits/locale/TimeUnitFormat.cpp b/src/kits/locale/TimeUnitFormat.cpp
index de125a7..61a8ba5 100644
    a b  
    88 */
    99
    1010
     11#include <unicode/uversion.h>
    1112#include <TimeUnitFormat.h>
    1213
    1314#include <new>

  • src/kits/locale/TimeZone.cpp 

    diff --git a/src/kits/locale/TimeZone.cpp b/src/kits/locale/TimeZone.cpp
index 86258e3..d4860c6 100644
    a b  
    88 */
    99
    1010
     11#include <unicode/uversion.h>
    1112#include <TimeZone.h>
    1213
    1314#include <new>

  • src/preferences/time/ZoneView.cpp 

    diff --git a/src/preferences/time/ZoneView.cpp b/src/preferences/time/ZoneView.cpp
index 03ca2c9..d62bbef 100644
    a b  
    1313 */
    1414
    1515
     16#include <unicode/uversion.h>
    1617#include "ZoneView.h"
    1718
    1819#include <stdlib.h>