organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-06 05:55:35 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 11

ICU-1209 use the new semantics for ures_getLocale

Browse source 
X-SVN-Rev: 6191
This commit is contained in:
Vladimir Weinstein 2001-10-11 18:43:18 +00:00
parent 68966254c3
commit 4bc8e648d1
2 changed files with 24 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
icu4c/source/common/resbund.cpp
View file

@ -170,19 +170,20 @@ U_NAMESPACE_BEGIN
ResourceBundle::ResourceBundle( const UnicodeString& path,
const Locale& locale,
UErrorCode& error)
:locName(NULL)
{
constructForLocale(path, locale, error);
}
ResourceBundle::ResourceBundle(UErrorCode &err) {
ResourceBundle::ResourceBundle(UErrorCode &err)
:locName(NULL)
{
resource = ures_open(0, Locale::getDefault().getName(), &err);
if(U_SUCCESS(err)) {
fRealLocale = Locale(ures_getRealLocale(resource, &err));
}
}
ResourceBundle::ResourceBundle( const UnicodeString& path,
UErrorCode& error)
:locName(NULL)
{
constructForLocale(path, Locale::getDefault(), error);
}
@ -190,12 +191,13 @@ ResourceBundle::ResourceBundle( const UnicodeString& path,
ResourceBundle::ResourceBundle(const wchar_t* path,
const Locale& locale,
UErrorCode& err)
:locName(NULL)
{
constructForLocale(path, locale, err);
}
ResourceBundle::ResourceBundle(const ResourceBundle &other)
: fRealLocale(other.fRealLocale)
:locName(NULL)
{
UErrorCode status = U_ZERO_ERROR;
@ -205,30 +207,23 @@ ResourceBundle::ResourceBundle(const ResourceBundle &other)
/* Copying a bad resource bundle */
resource = NULL;
}
// if(other.resource->fIsTopLevel == TRUE) {
// constructForLocale(ures_getPath(other.resource), Locale(ures_getName(other.resource)), status);
// } else {
// resource = copyResb(0, other.resource, &status);
// }
}
ResourceBundle::ResourceBundle(UResourceBundle *res, UErrorCode& err) {
ResourceBundle::ResourceBundle(UResourceBundle *res, UErrorCode& err)
:locName(NULL)
{
if (res) {
resource = ures_copyResb(0, res, &err);
if(U_SUCCESS(err)) {
fRealLocale = Locale(ures_getRealLocale(resource, &err));
}
} else {
/* Copying a bad resource bundle */
resource = NULL;
}
}
ResourceBundle::ResourceBundle( const char* path, const Locale& locale, UErrorCode& err) {
ResourceBundle::ResourceBundle( const char* path, const Locale& locale, UErrorCode& err)
:locName(NULL)
{
resource = ures_open(path, locale.getName(), &err);
if(U_SUCCESS(err)) {
fRealLocale = Locale(ures_getRealLocale(resource, &err));
}
}
@ -248,12 +243,6 @@ ResourceBundle& ResourceBundle::operator=(const ResourceBundle& other)
/* Copying a bad resource bundle */
resource = NULL;
}
fRealLocale = other.fRealLocale;
// if(other.resource->fIsTopLevel == TRUE) {
// constructForLocale(ures_getPath(other.resource), Locale(ures_getName(other.resource)), status);
// } else {
// resource = copyResb(resource, other.resource, &status);
// }
return *this;
}
@ -262,6 +251,9 @@ ResourceBundle::~ResourceBundle()
if(resource != 0) {
ures_close(resource);
}
if(locName != NULL) {
delete(locName);
}
}
void
@ -277,9 +269,6 @@ ResourceBundle::constructForLocale(const UnicodeString& path,
} else {
resource = ures_open(0, locale.getName(), &error);
}
if(U_SUCCESS(error)) {
fRealLocale = Locale(ures_getRealLocale(resource, &error));
}
}
void
@ -292,10 +281,6 @@ ResourceBundle::constructForLocale(const wchar_t* path,
} else {
resource = ures_open(0, locale.getName(), &error);
}
if(U_SUCCESS(error)) {
fRealLocale = Locale(ures_getRealLocale(resource, &error));
}
}
UnicodeString ResourceBundle::getString(UErrorCode& status) const {
@ -416,7 +401,13 @@ void ResourceBundle::getVersion(UVersionInfo versionInfo) const {
const Locale &ResourceBundle::getLocale(void) const
{
return fRealLocale;
if(locName == NULL) {
UErrorCode status = U_ZERO_ERROR;
const char *localeName = ures_getLocale(resource, &status);
ResourceBundle *me = (ResourceBundle *)this; // semantically const
me->locName = new Locale(localeName);
}
return *locName;
}
//eof

2
icu4c/source/common/unicode/resbund.h
View file

@ -429,7 +429,7 @@ private:
*@deprecated Remove after Aug 2002
*/
void constructForLocale(const wchar_t* path, const Locale& locale, UErrorCode& error);
Locale fRealLocale;
Locale *locName;
};
U_NAMESPACE_END