mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for #7798: Spelling error in locale GetCategory API. Made one change to mailnews to reflect new spelling

This commit is contained in:
tague%netscape.com 1999-06-09 02:37:14 +00:00
Родитель a3ac5e8cf3
Коммит 1fb0b5851e
13 изменённых файлов: 48 добавлений и 48 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
intl/locale/public/nsILocale.h
Просмотреть файл

@ -33,7 +33,7 @@ class nsILocale : public nsISupports {
public: public:
NS_IMETHOD GetCatagory(const nsString* catagory, nsString* result) = 0; NS_IMETHOD GetCategory(const nsString* category, nsString* result) = 0;
}; };

2
intl/locale/public/nsILocaleFactory.h
Просмотреть файл

@ -37,7 +37,7 @@ class nsILocaleFactory : public nsIFactory
public: public:
NS_IMETHOD NewLocale(nsString** catagoryList,nsString** NS_IMETHOD NewLocale(nsString** categoryList,nsString**
valueList, PRUint8 count, nsILocale** locale) = 0; valueList, PRUint8 count, nsILocale** locale) = 0;
NS_IMETHOD NewLocale(const nsString* localeName, nsILocale** locale) = 0; NS_IMETHOD NewLocale(const nsString* localeName, nsILocale** locale) = 0;

2
intl/locale/src/mac/nsCollationMac.cpp
Просмотреть файл

@ -134,7 +134,7 @@ nsresult nsCollationMac::Initialize(nsILocale* locale)
if (locale != nsnull) { if (locale != nsnull) {
nsString aLocale; nsString aLocale;
nsString aCategory("NSILOCALE_COLLATE"); nsString aCategory("NSILOCALE_COLLATE");
nsresult res = locale->GetCatagory(&aCategory, &aLocale); nsresult res = locale->GetCategory(&aCategory, &aLocale);
if (NS_FAILED(res)) { if (NS_FAILED(res)) {
return res; return res;
} }

2
intl/locale/src/mac/nsDateTimeFormatMac.cpp
Просмотреть файл

@ -262,7 +262,7 @@ nsresult nsDateTimeFormatMac::FormatTMTime(nsILocale* locale,
if (locale != nsnull) { if (locale != nsnull) {
nsString aLocale; nsString aLocale;
nsString aCategory("NSILOCALE_TIME"); nsString aCategory("NSILOCALE_TIME");
res = locale->GetCatagory(&aCategory, &aLocale); res = locale->GetCategory(&aCategory, &aLocale);
if (NS_FAILED(res)) { if (NS_FAILED(res)) {
return res; return res;
} }

10
intl/locale/src/nsLocale.cpp
Просмотреть файл

@ -34,9 +34,9 @@ NS_DEFINE_IID(kLocaleCID, NS_LOCALE_CID);
NS_IMPL_ISUPPORTS(nsLocale,kILocaleIID) NS_IMPL_ISUPPORTS(nsLocale,kILocaleIID)
nsLocale::nsLocale(nsString** catagoryList,nsString** valueList, PRUint32 count) nsLocale::nsLocale(nsString** categoryList,nsString** valueList, PRUint32 count)
: fHashtable(NULL), : fHashtable(NULL),
fCatagoryCount(0) fCategoryCount(0)
{ {
PRUint32 i; PRUint32 i;
@ -52,7 +52,7 @@ nsLocale::nsLocale(nsString** catagoryList,nsString** valueList, PRUint32 count)
{ {
for(i=0;i<count;i++) for(i=0;i<count;i++)
{ {
key = new nsString(*catagoryList[i]); key = new nsString(*categoryList[i]);
NS_ASSERTION(key!=NULL,"nsLocale: failed to allocate internal hash key"); NS_ASSERTION(key!=NULL,"nsLocale: failed to allocate internal hash key");
value = new nsString(*valueList[i]); value = new nsString(*valueList[i]);
NS_ASSERTION(value!=NULL,"nsLocale: failed to allocate internal hash value"); NS_ASSERTION(value!=NULL,"nsLocale: failed to allocate internal hash value");
@ -74,12 +74,12 @@ nsLocale::~nsLocale(void)
} }
NS_IMETHODIMP NS_IMETHODIMP
nsLocale::GetCatagory(const nsString* catagory,nsString* result) nsLocale::GetCategory(const nsString* category,nsString* result)
{ {
const nsString* value; const nsString* value;
value = (const nsString*)PL_HashTableLookup(fHashtable,catagory); value = (const nsString*)PL_HashTableLookup(fHashtable,category);
if (value!=NULL) if (value!=NULL)
{ {
(*result)=(*value); (*result)=(*value);

6
intl/locale/src/nsLocale.h
Просмотреть файл

@ -30,10 +30,10 @@ class nsLocale : public nsILocale {
public: public:
nsLocale(nsString** catagoryList,nsString** valueList, PRUint32 count); nsLocale(nsString** categoryList,nsString** valueList, PRUint32 count);
virtual ~nsLocale(void); virtual ~nsLocale(void);
NS_IMETHOD GetCatagory(const nsString* catagory, nsString* result); NS_IMETHOD GetCategory(const nsString* category, nsString* result);
private: private:
@ -42,7 +42,7 @@ private:
static PRIntn Hash_EnmerateDelete(PLHashEntry *he, PRIntn index, void *arg); static PRIntn Hash_EnmerateDelete(PLHashEntry *he, PRIntn index, void *arg);
PLHashTable* fHashtable; PLHashTable* fHashtable;
PRUint32 fCatagoryCount; PRUint32 fCategoryCount;
}; };

4
intl/locale/src/nsLocaleFactory.h
Просмотреть файл

@ -38,7 +38,7 @@ class nsLocaleFactory : public nsILocaleFactory
private: private:
nsString** fCatagoryList; nsString** fCategoryList;
nsILocale* fSystemLocale; nsILocale* fSystemLocale;
nsILocale* fApplicationLocale; nsILocale* fApplicationLocale;
#ifdef XP_PC #ifdef XP_PC
@ -58,7 +58,7 @@ public:
NS_IMETHOD LockFactory(PRBool aLock); NS_IMETHOD LockFactory(PRBool aLock);
NS_IMETHOD NewLocale(nsString** catagoryList,nsString** valueList, NS_IMETHOD NewLocale(nsString** categoryList,nsString** valueList,
PRUint8 count, nsILocale** locale); PRUint8 count, nsILocale** locale);
NS_IMETHOD NewLocale(const nsString* localeName, nsILocale** locale); NS_IMETHOD NewLocale(const nsString* localeName, nsILocale** locale);

2
intl/locale/src/unix/nsCollationUnix.cpp
Просмотреть файл

@ -62,7 +62,7 @@ nsresult nsCollationUnix::Initialize(nsILocale* locale)
if (locale != nsnull) { if (locale != nsnull) {
nsString aLocale; nsString aLocale;
nsString aCategory("NSILOCALE_COLLATE"); nsString aCategory("NSILOCALE_COLLATE");
nsresult res = locale->GetCatagory(&aCategory, &aLocale); nsresult res = locale->GetCategory(&aCategory, &aLocale);
if (NS_FAILED(res)) { if (NS_FAILED(res)) {
return res; return res;
} }

2
intl/locale/src/unix/nsDateTimeFormatUnix.cpp
Просмотреть файл

@ -60,7 +60,7 @@ nsresult nsDateTimeFormatUnix::FormatTMTime(nsILocale* locale,
nsString aLocale; nsString aLocale;
nsString aCategory("NSILOCALE_TIME"); nsString aCategory("NSILOCALE_TIME");
res = locale->GetCatagory(&aCategory, &aLocale); res = locale->GetCategory(&aCategory, &aLocale);
if (NS_FAILED(res)) { if (NS_FAILED(res)) {
return res; return res;
} }

2
intl/locale/src/windows/nsCollationWin.cpp
Просмотреть файл

@ -72,7 +72,7 @@ nsresult nsCollationWin::Initialize(nsILocale* locale)
if (locale != nsnull) { if (locale != nsnull) {
nsString aLocale; nsString aLocale;
nsString aCategory("NSILOCALE_COLLATE"); nsString aCategory("NSILOCALE_COLLATE");
nsresult res = locale->GetCatagory(&aCategory, &aLocale); nsresult res = locale->GetCategory(&aCategory, &aLocale);
if (NS_FAILED(res)) { if (NS_FAILED(res)) {
return res; return res;
} }

2
intl/locale/src/windows/nsDateTimeFormatWin.cpp
Просмотреть файл

@ -116,7 +116,7 @@ nsresult nsDateTimeFormatWin::FormatTMTime(nsILocale* locale,
if (locale != nsnull) { if (locale != nsnull) {
nsString aLocale; nsString aLocale;
nsString aCategory("NSILOCALE_TIME"); nsString aCategory("NSILOCALE_TIME");
nsresult res = locale->GetCatagory(&aCategory, &aLocale); nsresult res = locale->GetCategory(&aCategory, &aLocale);
if (NS_FAILED(res)) { if (NS_FAILED(res)) {
return res; return res;
} }

58
intl/locale/tests/nsLocaleTest.cpp
Просмотреть файл

@ -55,7 +55,7 @@ NS_DEFINE_CID(kMacLocaleFactoryCID, NS_MACLOCALEFACTORY_CID);
NS_DEFINE_IID(kIMacLocaleIID, NS_IMACLOCALE_IID); NS_DEFINE_IID(kIMacLocaleIID, NS_IMACLOCALE_IID);
#endif #endif
char* localeCatagoryList[6] = { "NSILOCALE_TIME", char* localeCategoryList[6] = { "NSILOCALE_TIME",
"NSILOCALE_COLLATE", "NSILOCALE_COLLATE",
"NSILOCALE_CTYPE", "NSILOCALE_CTYPE",
"NSILOCALE_MONETARY", "NSILOCALE_MONETARY",
@ -150,9 +150,9 @@ factory_new_locale(void)
nsresult result; nsresult result;
nsILocaleFactory* localeFactory; nsILocaleFactory* localeFactory;
nsILocale* locale; nsILocale* locale;
nsString* localeName, *catagory, *value; nsString* localeName, *category, *value;
int i; int i;
nsString** catagoryList, **valueList; nsString** categoryList, **valueList;
result = nsComponentManager::FindFactory(kLocaleFactoryCID, result = nsComponentManager::FindFactory(kLocaleFactoryCID,
(nsIFactory**)&localeFactory); (nsIFactory**)&localeFactory);
@ -170,36 +170,36 @@ factory_new_locale(void)
for(i=0;i<6;i++) for(i=0;i<6;i++)
{ {
catagory = new nsString(localeCatagoryList[i]); category = new nsString(localeCategoryList[i]);
value = new nsString(); value = new nsString();
result = locale->GetCatagory(catagory,value); result = locale->GetCategory(category,value);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_new_interface failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_new_interface failed");
NS_ASSERTION(value->Equals(*localeName)==PR_TRUE,"nsLocaleTest: factory_new_interface failed"); NS_ASSERTION(value->Equals(*localeName)==PR_TRUE,"nsLocaleTest: factory_new_interface failed");
delete catagory; delete category;
delete value; delete value;
} }
delete localeName; delete localeName;
locale->Release(); locale->Release();
catagoryList = new nsString*[6]; categoryList = new nsString*[6];
valueList = new nsString*[6]; valueList = new nsString*[6];
for(i=0;i<6;i++) for(i=0;i<6;i++)
{ {
catagoryList[i] = new nsString(localeCatagoryList[i]); categoryList[i] = new nsString(localeCategoryList[i]);
valueList[i] = new nsString("x-netscape"); valueList[i] = new nsString("x-netscape");
} }
result = localeFactory->NewLocale(catagoryList,valueList,6,&locale); result = localeFactory->NewLocale(categoryList,valueList,6,&locale);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_new_interface failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_new_interface failed");
NS_ASSERTION(locale!=NULL,"nsLocaleTest: factory_new_interface failed"); NS_ASSERTION(locale!=NULL,"nsLocaleTest: factory_new_interface failed");
for(i=0;i<6;i++) for(i=0;i<6;i++)
{ {
value = new nsString(); value = new nsString();
result = locale->GetCatagory(catagoryList[i],value); result = locale->GetCategory(categoryList[i],value);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_new_interface failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_new_interface failed");
NS_ASSERTION(value->Equals(*(valueList[i]))==PR_TRUE,"nsLocaleTest: factory_new_interface failed"); NS_ASSERTION(value->Equals(*(valueList[i]))==PR_TRUE,"nsLocaleTest: factory_new_interface failed");
@ -208,11 +208,11 @@ factory_new_locale(void)
for(i=0;i<6;i++) for(i=0;i<6;i++)
{ {
delete catagoryList[i]; delete categoryList[i];
delete valueList[i]; delete valueList[i];
} }
delete [] catagoryList; delete [] categoryList;
delete [] valueList; delete [] valueList;
locale->Release(); locale->Release();
@ -227,7 +227,7 @@ factory_get_locale(void)
nsresult result; nsresult result;
nsILocaleFactory* localeFactory; nsILocaleFactory* localeFactory;
nsILocale* locale; nsILocale* locale;
nsString* catagory; nsString* category;
nsString* value; nsString* value;
const char* acceptLangString = "ja;q=0.9,en;q=1.0,*"; const char* acceptLangString = "ja;q=0.9,en;q=1.0,*";
@ -248,17 +248,17 @@ factory_get_locale(void)
// //
locale->AddRef(); locale->AddRef();
catagory = new nsString("NSILOCALE_CTYPE"); category = new nsString("NSILOCALE_CTYPE");
value = new nsString(); value = new nsString();
result = locale->GetCatagory(catagory,value); result = locale->GetCategory(category,value);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_get_locale failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_get_locale failed");
NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed"); NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed");
locale->Release(); locale->Release();
locale->Release(); locale->Release();
delete catagory; delete category;
delete value; delete value;
// //
@ -273,17 +273,17 @@ factory_get_locale(void)
// //
locale->AddRef(); locale->AddRef();
catagory = new nsString("NSILOCALE_CTYPE"); category = new nsString("NSILOCALE_CTYPE");
value = new nsString(); value = new nsString();
result = locale->GetCatagory(catagory,value); result = locale->GetCategory(category,value);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_get_locale failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_get_locale failed");
NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed"); NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed");
locale->Release(); locale->Release();
locale->Release(); locale->Release();
delete catagory; delete category;
delete value; delete value;
// //
@ -298,17 +298,17 @@ factory_get_locale(void)
// //
locale->AddRef(); locale->AddRef();
catagory = new nsString("NSILOCALE_CTYPE"); category = new nsString("NSILOCALE_CTYPE");
value = new nsString(); value = new nsString();
result = locale->GetCatagory(catagory,value); result = locale->GetCategory(category,value);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_get_locale failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_get_locale failed");
NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed"); NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed");
locale->Release(); locale->Release();
locale->Release(); locale->Release();
delete catagory; delete category;
delete value; delete value;
localeFactory->Release(); localeFactory->Release();
@ -594,7 +594,7 @@ win32_test_special_locales(void)
nsIWin32Locale* win32Locale; nsIWin32Locale* win32Locale;
nsILocale* xp_locale; nsILocale* xp_locale;
nsILocaleFactory* xp_locale_factory; nsILocaleFactory* xp_locale_factory;
nsString* locale, *result_locale, *catagory; nsString* locale, *result_locale, *category;
LCID sys_lcid, user_lcid; LCID sys_lcid, user_lcid;
result = nsComponentManager::CreateInstance(kWin32LocaleFactoryCID, result = nsComponentManager::CreateInstance(kWin32LocaleFactoryCID,
@ -609,7 +609,7 @@ win32_test_special_locales(void)
NS_ASSERTION(xp_locale_factory!=NULL,"nsLocaleTest: factory_create_interface failed."); NS_ASSERTION(xp_locale_factory!=NULL,"nsLocaleTest: factory_create_interface failed.");
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed");
catagory = new nsString(localeCatagoryList[0]); category = new nsString(localeCategoryList[0]);
// //
// derive a system locale // derive a system locale
@ -624,7 +624,7 @@ win32_test_special_locales(void)
result = win32Locale->GetXPLocale(sys_lcid,locale); result = win32Locale->GetXPLocale(sys_lcid,locale);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed");
result = xp_locale->GetCatagory(catagory,result_locale); result = xp_locale->GetCategory(category,result_locale);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed");
NS_ASSERTION(*locale==*result_locale,"nsLocaleTest: system locale test failed."); NS_ASSERTION(*locale==*result_locale,"nsLocaleTest: system locale test failed.");
@ -645,7 +645,7 @@ win32_test_special_locales(void)
result = win32Locale->GetXPLocale(user_lcid,locale); result = win32Locale->GetXPLocale(user_lcid,locale);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed");
result = xp_locale->GetCatagory(catagory,result_locale); result = xp_locale->GetCategory(category,result_locale);
NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: factory_create_interface failed");
NS_ASSERTION(*locale==*result_locale,"nsLocaleTest: system locale test failed."); NS_ASSERTION(*locale==*result_locale,"nsLocaleTest: system locale test failed.");
@ -653,7 +653,7 @@ win32_test_special_locales(void)
delete result_locale; delete result_locale;
xp_locale->Release(); xp_locale->Release();
delete catagory; delete category;
xp_locale_factory->Release(); xp_locale_factory->Release();
win32Locale->Release(); win32Locale->Release();
@ -941,7 +941,7 @@ posixlocale_test_special(void)
NS_ASSERTION(xp_locale!=NULL,"nsLocaleTest: GetSystemLocale failed.\n"); NS_ASSERTION(xp_locale!=NULL,"nsLocaleTest: GetSystemLocale failed.\n");
NS_ASSERTION(result==NS_OK,"nsLocaleTest: GetSystemLocale failed.\n"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: GetSystemLocale failed.\n");
result = xp_locale->GetCatagory(lc_message,result_locale); result = xp_locale->GetCategory(lc_message,result_locale);
NS_ASSERTION(*result_locale==*locale,"nsLocaleTest: GetSystemLocale failed.\n"); NS_ASSERTION(*result_locale==*locale,"nsLocaleTest: GetSystemLocale failed.\n");
NS_ASSERTION(result==NS_OK,"nsLocaleTest: GetSystemLocale failed.\n"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: GetSystemLocale failed.\n");
@ -952,7 +952,7 @@ posixlocale_test_special(void)
NS_ASSERTION(result==NS_OK,"nsLocaleTest: GetApplicationLocale failed.\n"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: GetApplicationLocale failed.\n");
result = xp_locale->GetCatagory(lc_message,result_locale); result = xp_locale->GetCategory(lc_message,result_locale);
NS_ASSERTION(*result_locale==*locale,"nsLocaleTest: GetSystemLocale failed.\n"); NS_ASSERTION(*result_locale==*locale,"nsLocaleTest: GetSystemLocale failed.\n");
NS_ASSERTION(result==NS_OK,"nsLocaleTest: GetSystemLocale failed.\n"); NS_ASSERTION(result==NS_OK,"nsLocaleTest: GetSystemLocale failed.\n");
xp_locale->Release(); xp_locale->Release();

2
mailnews/db/msgdb/src/nsMsgDatabase.cpp
Просмотреть файл

@ -2037,7 +2037,7 @@ nsresult nsMsgDatabase::RowCellColumnToCollationKey(nsIMdbRow *row, mdb_token co
// and locale name can be taken as below, category should be one of the following // and locale name can be taken as below, category should be one of the following
// probably NSILOCALE_COLLATE is appropriate // probably NSILOCALE_COLLATE is appropriate
nsString catagory = "NSILOCALE_COLLATE"; nsString catagory = "NSILOCALE_COLLATE";
err = locale->GetCatagory(&catagory, &localeName); err = locale->GetCategory(&catagory, &localeName);
nsICollationFactory *f; nsICollationFactory *f;