Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 183156 remove *UCS2* functions, replacing them with *UTF16* ones

Browse Source 
r+sr=darin


git-svn-id: svn://10.0.0.236/trunk@188844 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cbiesinger%web.de
2006-02-03 14:18:39 +00:00
parent aec0aae014
commit 6322c04952
462 changed files with 1529 additions and 1542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -4304,7 +4304,7 @@ public:
NS_METHOD NamedItem(const nsAString& aName, nsIDOMMimeType** aReturn)
{
for (int index = mPluginTag.mVariants - 1; index >= 0; --index) {
if (aName.Equals(NS_ConvertASCIItoUCS2(mPluginTag.mMimeTypeArray[index])))
if (aName.Equals(NS_ConvertASCIItoUTF16(mPluginTag.mMimeTypeArray[index])))
return Item(index, aReturn);
}
return NS_OK;
@@ -4933,7 +4933,7 @@ nsresult nsPluginHostImpl::ScanPluginsDirectory(nsIFile * pluginsDir,
PRInt64 fileModTime = pfd->mModTime;
// Look for it in our cache
nsPluginTag *pluginTag = RemoveCachedPluginsInfo(NS_ConvertUCS2toUTF8(pfd->mFilename).get());
nsPluginTag *pluginTag = RemoveCachedPluginsInfo(NS_ConvertUTF16toUTF8(pfd->mFilename).get());
if (pluginTag) {
// If plugin changed, delete cachedPluginTag and don't use cache

4
mozilla/modules/plugin/base/src/nsPluginsDirBeOS.cpp
View File

@@ -233,8 +233,8 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info)
if (appinfo.GetVersionInfo(&vinfo, B_APP_VERSION_KIND) == B_OK
&& *vinfo.short_info) {
// XXX convert UTF-8 2byte chars to 1 byte chars, to avoid string corruption
info.fName = ToNewCString(NS_ConvertUTF8toUCS2(vinfo.short_info));
info.fDescription = ToNewCString(NS_ConvertUTF8toUCS2(vinfo.long_info));
info.fName = ToNewCString(NS_ConvertUTF8toUTF16(vinfo.short_info));
info.fDescription = ToNewCString(NS_ConvertUTF8toUTF16(vinfo.long_info));
} else {
// use filename as its name
info.fName = GetFileName(path);

2
mozilla/modules/plugin/base/src/nsPluginsDirWin.cpp
View File

@@ -73,7 +73,7 @@ static char* GetKeyValue(char* verbuf, char* key)
// On windows CE, the verbuf is wide and the shunt
// layer can't do much about it. So, here we
// convert the wide string.
return PL_strdup(NS_ConvertUCS2toUTF8((PRUnichar*)buf).get());
return PL_strdup(NS_ConvertUTF16toUTF8((PRUnichar*)buf).get());
#else
return PL_strdup(buf);
#endif