зеркало из https://github.com/mozilla/gecko-dev.git
making string conversions explicit
This commit is contained in:
Родитель
57feeae5ec
Коммит
e13111e53e
|
@ -137,7 +137,7 @@ NS_IMETHODIMP nsAbAddressCollecter::CollectAddress(const char *address)
|
|||
}
|
||||
else
|
||||
{
|
||||
nsAutoString senderFromEmail(curAddress);
|
||||
nsAutoString senderFromEmail; senderFromEmail.AssignWithConversion(curAddress);
|
||||
PRInt32 atSignIndex = senderFromEmail.FindChar('@');
|
||||
if (atSignIndex > 0)
|
||||
{
|
||||
|
@ -145,7 +145,7 @@ NS_IMETHODIMP nsAbAddressCollecter::CollectAddress(const char *address)
|
|||
senderCard->SetDisplayName((PRUnichar*)senderFromEmail.GetUnicode());
|
||||
}
|
||||
}
|
||||
nsAutoString email(curAddress);
|
||||
nsAutoString email; email.AssignWithConversion(curAddress);
|
||||
senderCard->SetPrimaryEmail((PRUnichar*)email.GetUnicode());
|
||||
senderCard->AddCardToDatabase("abdirectory://history.mab");
|
||||
}
|
||||
|
|
|
@ -114,7 +114,7 @@ void nsAbAutoCompleteSession::AddToResult(const PRUnichar* pNickNameStr, const P
|
|||
return;
|
||||
|
||||
nsAutoString aStr = pNameStr;
|
||||
aStr += '@';
|
||||
aStr.AppendWithConversion('@');
|
||||
aStr += mDefaultDomain;
|
||||
fullAddrStr = aStr.ToNewUnicode();
|
||||
}
|
||||
|
@ -141,9 +141,9 @@ void nsAbAutoCompleteSession::AddToResult(const PRUnichar* pNickNameStr, const P
|
|||
{
|
||||
//oops, parser problem! I will try to do my best...
|
||||
nsAutoString aStr = pNameStr;
|
||||
aStr += " <";
|
||||
aStr.AppendWithConversion(" <");
|
||||
aStr += pEmailStr;
|
||||
aStr += ">";
|
||||
aStr.AppendWithConversion(">");
|
||||
fullAddrStr = aStr.ToNewUnicode();
|
||||
}
|
||||
|
||||
|
@ -282,7 +282,7 @@ nsresult nsAbAutoCompleteSession::SearchDirectory(nsString& fileName, const PRUn
|
|||
nsCOMPtr<nsIAbDirectory> directory(do_QueryInterface(resource, &rv));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
if (fileName != nsAutoString(kDirectoryDataSourceRoot))
|
||||
if (!fileName.EqualsWithConversion(kDirectoryDataSourceRoot))
|
||||
rv = SearchCards(directory, searchStr, results);
|
||||
|
||||
if (!searchSubDirectory)
|
||||
|
@ -306,8 +306,8 @@ nsresult nsAbAutoCompleteSession::SearchDirectory(nsString& fileName, const PRUn
|
|||
{
|
||||
nsAutoString subFileName(fileName);
|
||||
if (subFileName.Last() != '/')
|
||||
subFileName += "/";
|
||||
subFileName += server->fileName;
|
||||
subFileName.AppendWithConversion("/");
|
||||
subFileName.AppendWithConversion(server->fileName);
|
||||
rv = SearchDirectory(subFileName, searchStr, results, PR_TRUE);
|
||||
}
|
||||
}
|
||||
|
@ -424,7 +424,7 @@ NS_IMETHODIMP nsAbAutoCompleteSession::OnStartLookup(const PRUnichar *uSearchStr
|
|||
rv = nsComponentManager::CreateInstance(kAutoCompleteResultsCID, nsnull, NS_GET_IID(nsIAutoCompleteResults), getter_AddRefs(results));
|
||||
if (NS_SUCCEEDED(rv))
|
||||
{
|
||||
nsAutoString root = kDirectoryDataSourceRoot;
|
||||
nsAutoString root; root.AssignWithConversion(kDirectoryDataSourceRoot);
|
||||
rv = SearchDirectory(root, uSearchString, results, PR_TRUE);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -186,8 +186,8 @@ nsresult nsAbCard::AddSubNode(nsAutoString name, nsIAbCard **childCard)
|
|||
return rv;
|
||||
|
||||
nsAutoString uri;
|
||||
uri.Append(mURI);
|
||||
uri.Append('/');
|
||||
uri.AppendWithConversion(mURI);
|
||||
uri.AppendWithConversion('/');
|
||||
|
||||
uri.Append(name);
|
||||
char* uriStr = uri.ToNewCString();
|
||||
|
|
|
@ -95,43 +95,6 @@ nsAbCardProperty::nsAbCardProperty(void)
|
|||
{
|
||||
NS_INIT_REFCNT();
|
||||
|
||||
m_FirstName = "";
|
||||
m_LastName = "";
|
||||
m_DisplayName = "";
|
||||
m_NickName = "";
|
||||
m_PrimaryEmail = "";
|
||||
m_SecondEmail = "";
|
||||
m_WorkPhone = "";
|
||||
m_HomePhone = "";
|
||||
m_FaxNumber = "";
|
||||
m_PagerNumber = "";
|
||||
m_CellularNumber = "";
|
||||
|
||||
m_HomeAddress = "";
|
||||
m_HomeAddress2 = "";
|
||||
m_HomeCity = "";
|
||||
m_HomeState = "";
|
||||
m_HomeZipCode = "";
|
||||
m_HomeCountry = "";
|
||||
m_WorkAddress = "";
|
||||
m_WorkAddress2 = "";
|
||||
m_WorkCity = "";
|
||||
m_WorkState = "";
|
||||
m_WorkZipCode = "";
|
||||
m_WorkCountry = "";
|
||||
m_JobTitle = "";
|
||||
m_Department = "";
|
||||
m_Company = "";
|
||||
m_WebPage1 = "";
|
||||
m_WebPage2 = "";
|
||||
m_BirthYear = "";
|
||||
m_BirthMonth = "";
|
||||
m_BirthDay = "";
|
||||
m_Custom1 = "";
|
||||
m_Custom2 = "";
|
||||
m_Custom3 = "";
|
||||
m_Custom4 = "";
|
||||
m_Note = "";
|
||||
m_LastModDate = 0;
|
||||
|
||||
m_bSendPlainText = PR_TRUE;
|
||||
|
@ -1218,13 +1181,13 @@ nsAbCardProperty::GetName(PRUnichar * *aName)
|
|||
if (lastNameFirst == 1)
|
||||
{
|
||||
name = lastName;
|
||||
name.Append(", ");
|
||||
name.AppendWithConversion(", ");
|
||||
name += firstName;
|
||||
}
|
||||
else
|
||||
{
|
||||
name = firstName;
|
||||
name.Append(" ");
|
||||
name.AppendWithConversion(" ");
|
||||
name += lastName;
|
||||
}
|
||||
}
|
||||
|
@ -1275,7 +1238,7 @@ static const char *kAbPrintUrlFormat = "addbook:printone?email=%s&folder=%s";
|
|||
*aPrintCardUrl = PR_smprintf("");
|
||||
return NS_OK;
|
||||
}
|
||||
dirNameStr.ReplaceSubstring(" ", "%20");
|
||||
dirNameStr.ReplaceSubstring(NS_ConvertASCIItoUCS2(" "), NS_ConvertASCIItoUCS2("%20"));
|
||||
|
||||
char *emailCharStr = emailStr.ToNewCString();
|
||||
char *dirCharStr = dirNameStr.ToNewCString();
|
||||
|
|
|
@ -51,14 +51,11 @@ static NS_DEFINE_CID(kAddrBookSessionCID, NS_ADDRBOOKSESSION_CID);
|
|||
static NS_DEFINE_CID(kAddrBookCID, NS_ADDRESSBOOK_CID);
|
||||
|
||||
nsAbDirProperty::nsAbDirProperty(void)
|
||||
: m_DirName(""), m_LastModifiedDate(0),
|
||||
: m_LastModifiedDate(0),
|
||||
m_DbPath(nsnull), m_Server(nsnull)
|
||||
{
|
||||
NS_INIT_REFCNT();
|
||||
|
||||
m_ListName = "";
|
||||
m_ListNickName = "";
|
||||
m_Description = "";
|
||||
m_bIsMailList = PR_FALSE;
|
||||
}
|
||||
|
||||
|
|
|
@ -198,7 +198,7 @@ NS_IMETHODIMP nsAbDirectory::GetChildNodes(nsIEnumerator* *result)
|
|||
|
||||
if (server->dirType == PABDirectory)
|
||||
{
|
||||
nsString name(server->fileName);
|
||||
nsString name; name.AssignWithConversion(server->fileName);
|
||||
PRInt32 pos = name.Find("na2");
|
||||
if (pos >= 0) /* check: this is a 4.x file, remove when conversion is done */
|
||||
continue;
|
||||
|
@ -233,7 +233,7 @@ NS_IMETHODIMP nsAbDirectory::GetChildNodes(nsIEnumerator* *result)
|
|||
nsFileSpec* dbPath;
|
||||
abSession->GetUserProfileDirectory(&dbPath);
|
||||
|
||||
nsString file(server->fileName);
|
||||
nsString file; file.AssignWithConversion(server->fileName);
|
||||
(*dbPath) += file;
|
||||
|
||||
NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv);
|
||||
|
@ -309,7 +309,7 @@ NS_IMETHODIMP nsAbDirectory::GetChildCards(nsIEnumerator* *result)
|
|||
{
|
||||
if (mURI && mIsMailingList == -1)
|
||||
{
|
||||
nsString file(&(mURI[PL_strlen(kDirectoryDataSourceRoot)]));
|
||||
nsString file; file.AssignWithConversion(&(mURI[PL_strlen(kDirectoryDataSourceRoot)]));
|
||||
PRInt32 pos = file.Find("/");
|
||||
if (pos != -1)
|
||||
mIsMailingList = 1;
|
||||
|
@ -385,7 +385,7 @@ NS_IMETHODIMP nsAbDirectory::AddChildCards(const char *uriName, nsIAbCard **chil
|
|||
if(NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
nsAutoString uri(uriName);
|
||||
nsAutoString uri; uri.AssignWithConversion(uriName);
|
||||
char* uriStr = uri.ToNewCString();
|
||||
if (uriStr == nsnull)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
|
|
@ -72,7 +72,7 @@ void nsAbRDFDataSource::createNode(nsString& str, nsIRDFNode **node)
|
|||
void nsAbRDFDataSource::createNode(PRUint32 value, nsIRDFNode **node)
|
||||
{
|
||||
char *valueStr = PR_smprintf("%d", value);
|
||||
nsString str(valueStr);
|
||||
nsString str; str.AssignWithConversion(valueStr);
|
||||
createNode(str, node);
|
||||
PR_smprintf_free(valueStr);
|
||||
}
|
||||
|
|
|
@ -95,7 +95,7 @@ nsresult nsAbRDFResource::GetAbDatabase()
|
|||
if(NS_SUCCEEDED(rv))
|
||||
abSession->GetUserProfileDirectory(&dbPath);
|
||||
|
||||
nsString file(&(mURI[PL_strlen(kDirectoryDataSourceRoot)]));
|
||||
nsString file; file.AssignWithConversion(&(mURI[PL_strlen(kDirectoryDataSourceRoot)]));
|
||||
PRInt32 pos = file.Find("/");
|
||||
if (pos != -1)
|
||||
file.Truncate(pos);
|
||||
|
@ -127,7 +127,7 @@ nsresult nsAbRDFResource::GetDatabaseFromFile(char* pDbFile)
|
|||
if(NS_SUCCEEDED(rv))
|
||||
abSession->GetUserProfileDirectory(&dbPath);
|
||||
|
||||
nsString file(pDbFile);
|
||||
nsString file; file.AssignWithConversion(pDbFile);
|
||||
(*dbPath) += file;
|
||||
|
||||
NS_WITH_SERVICE(nsIAddrDatabase, addrDBFactory, kAddressBookDBCID, &rv);
|
||||
|
|
|
@ -168,7 +168,7 @@ nsAddbookProtocolHandler::GenerateHTMLOutputChannel( char *aHtmlOutput,
|
|||
if (!aHtmlOutput)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
rv = NS_NewStringInputStream(getter_AddRefs(s), aHtmlOutput);
|
||||
rv = NS_NewStringInputStream(getter_AddRefs(s), NS_ConvertASCIItoUCS2(aHtmlOutput));
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
|
@ -279,18 +279,18 @@ nsAddbookProtocolHandler::AddIndividualUserAttribPair(nsString &aString, const c
|
|||
|
||||
if (NS_SUCCEEDED(aCard->GetCardValue(aColumn, &aName)) && (aName) && (*aName))
|
||||
{
|
||||
aString.Append("<tr>");
|
||||
aString.AppendWithConversion("<tr>");
|
||||
|
||||
aString.Append("<td><b>");
|
||||
aString.AppendWithConversion("<td><b>");
|
||||
// RICHIE - Should really convert this to some string bundled thing?
|
||||
aString.Append(aColumn);
|
||||
aString.Append("</b></td>");
|
||||
aString.AppendWithConversion(aColumn);
|
||||
aString.AppendWithConversion("</b></td>");
|
||||
|
||||
aString.Append("<td>");
|
||||
aString.AppendWithConversion("<td>");
|
||||
aString.Append(aName);
|
||||
aString.Append("</td>");
|
||||
aString.AppendWithConversion("</td>");
|
||||
|
||||
aString.Append("</tr>");
|
||||
aString.AppendWithConversion("</tr>");
|
||||
}
|
||||
|
||||
return NS_OK;
|
||||
|
@ -319,7 +319,7 @@ nsAddbookProtocolHandler::FindPossibleAbName(nsIAbCard *aCard,
|
|||
char *val = (char *)valuelist->ElementAt(i);
|
||||
if ( (val) && (*val) )
|
||||
{
|
||||
*retName = nsString(val).ToNewUnicode();
|
||||
*retName = NS_ConvertASCIItoUCS2(val).ToNewUnicode();
|
||||
rv = NS_OK;
|
||||
}
|
||||
}
|
||||
|
@ -335,7 +335,7 @@ nsAddbookProtocolHandler::GeneratePrintOutput(nsIAddbookUrl *addbookUrl,
|
|||
char **outBuf)
|
||||
{
|
||||
nsresult rv = NS_OK;
|
||||
nsString workBuffer = "";
|
||||
nsString workBuffer;
|
||||
nsIAddrDatabase *aDatabase = nsnull;
|
||||
|
||||
if (!outBuf)
|
||||
|
@ -458,23 +458,23 @@ nsAddbookProtocolHandler::BuildSingleHTML(nsIAddrDatabase *aDatabase, nsIAbDirec
|
|||
return NS_ERROR_FAILURE;
|
||||
|
||||
// Ok, build a little HTML for output...
|
||||
workBuffer.Append("<HTML><BODY>");
|
||||
workBuffer.Append("<CENTER>");
|
||||
workBuffer.Append("<TABLE BORDER>");
|
||||
workBuffer.AppendWithConversion("<HTML><BODY>");
|
||||
workBuffer.AppendWithConversion("<CENTER>");
|
||||
workBuffer.AppendWithConversion("<TABLE BORDER>");
|
||||
|
||||
if (NS_SUCCEEDED(workCard->GetName(&aName)) && (aName))
|
||||
{
|
||||
workBuffer.Append("<caption><b>");
|
||||
workBuffer.AppendWithConversion("<caption><b>");
|
||||
workBuffer.Append(aName);
|
||||
workBuffer.Append("</b></caption>");
|
||||
workBuffer.AppendWithConversion("</b></caption>");
|
||||
}
|
||||
|
||||
for (PRInt32 i=0; i<kMaxReportColumns; i++)
|
||||
AddIndividualUserAttribPair(workBuffer, mReportColumns[i].abField, workCard);
|
||||
|
||||
workBuffer.Append("</TABLE>");
|
||||
workBuffer.Append("<CENTER>");
|
||||
workBuffer.Append("</BODY></HTML>");
|
||||
workBuffer.AppendWithConversion("</TABLE>");
|
||||
workBuffer.AppendWithConversion("<CENTER>");
|
||||
workBuffer.AppendWithConversion("</BODY></HTML>");
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
@ -519,9 +519,9 @@ nsAddbookProtocolHandler::BuildAllHTML(nsIAddrDatabase *aDatabase, nsIAbDirector
|
|||
// Now, we need to generate some fun output!
|
||||
//
|
||||
// Ok, build a little HTML for output...
|
||||
workBuffer.Append("<HTML><BODY>");
|
||||
workBuffer.Append("<CENTER>");
|
||||
workBuffer.Append("<TABLE BORDER>");
|
||||
workBuffer.AppendWithConversion("<HTML><BODY>");
|
||||
workBuffer.AppendWithConversion("<CENTER>");
|
||||
workBuffer.AppendWithConversion("<TABLE BORDER>");
|
||||
|
||||
GenerateColumnHeadings(workBuffer);
|
||||
|
||||
|
@ -546,9 +546,9 @@ nsAddbookProtocolHandler::BuildAllHTML(nsIAddrDatabase *aDatabase, nsIAbDirector
|
|||
|
||||
// Finish up and get out!
|
||||
//
|
||||
workBuffer.Append("</TABLE>");
|
||||
workBuffer.Append("<CENTER>");
|
||||
workBuffer.Append("</BODY></HTML>");
|
||||
workBuffer.AppendWithConversion("</TABLE>");
|
||||
workBuffer.AppendWithConversion("<CENTER>");
|
||||
workBuffer.AppendWithConversion("</BODY></HTML>");
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
@ -568,14 +568,14 @@ TackOnColumn(nsIAbCard *aCard, const char *aColumn, nsString &aString)
|
|||
{
|
||||
PRUnichar *aName = nsnull;
|
||||
|
||||
aString.Append("<td>");
|
||||
aString.AppendWithConversion("<td>");
|
||||
|
||||
if (NS_SUCCEEDED(aCard->GetCardValue(aColumn, &aName)) && (aName) && (*aName))
|
||||
{
|
||||
aString.Append(aName);
|
||||
}
|
||||
|
||||
aString.Append("</td>");
|
||||
aString.AppendWithConversion("</td>");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -594,22 +594,22 @@ nsAddbookProtocolHandler::CheckColumnValidity(nsIAbCard *aCard)
|
|||
NS_IMETHODIMP
|
||||
nsAddbookProtocolHandler::GenerateColumnHeadings(nsString &aString)
|
||||
{
|
||||
aString.Append("<tr>");
|
||||
aString.AppendWithConversion("<tr>");
|
||||
|
||||
for (PRInt32 i=0; i<kMaxReportColumns; i++)
|
||||
{
|
||||
if (mReportColumns[i].includeIt)
|
||||
{
|
||||
aString.Append("<td>");
|
||||
aString.Append("<B>");
|
||||
aString.AppendWithConversion("<td>");
|
||||
aString.AppendWithConversion("<B>");
|
||||
// RICHIE - Should really convert this to some string bundled thing?
|
||||
aString.Append(mReportColumns[i].abField);
|
||||
aString.Append("</B>");
|
||||
aString.Append("</td>");
|
||||
aString.AppendWithConversion(mReportColumns[i].abField);
|
||||
aString.AppendWithConversion("</B>");
|
||||
aString.AppendWithConversion("</td>");
|
||||
}
|
||||
}
|
||||
|
||||
aString.Append("</tr>");
|
||||
aString.AppendWithConversion("</tr>");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -617,7 +617,7 @@ NS_IMETHODIMP
|
|||
nsAddbookProtocolHandler::GenerateRowForCard(nsString &aString,
|
||||
nsIAbCard *aCard)
|
||||
{
|
||||
aString.Append("<tr>");
|
||||
aString.AppendWithConversion("<tr>");
|
||||
|
||||
for (PRInt32 i=0; i<kMaxReportColumns; i++)
|
||||
{
|
||||
|
@ -625,7 +625,7 @@ nsAddbookProtocolHandler::GenerateRowForCard(nsString &aString,
|
|||
TackOnColumn(aCard, mReportColumns[i].abField, aString);
|
||||
}
|
||||
|
||||
aString.Append("</tr>");
|
||||
aString.AppendWithConversion("</tr>");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -241,7 +241,7 @@ nsresult nsAddbookUrl::ParseUrl()
|
|||
nsXPIDLCString aPath;
|
||||
m_baseURL->GetPath(getter_Copies(aPath));
|
||||
if (aPath)
|
||||
mOperationPart = aPath;
|
||||
mOperationPart.Assign(aPath);
|
||||
|
||||
PRInt32 startOfSearchPart = mOperationPart.FindChar('?');
|
||||
if (startOfSearchPart > 0)
|
||||
|
|
|
@ -2269,7 +2269,7 @@ nsresult nsAddrDatabase::GetStringColumn(nsIMdbRow *cardRow, mdb_token outToken,
|
|||
{
|
||||
struct mdbYarn yarn;
|
||||
cardCell->AliasYarn(GetEnv(), &yarn);
|
||||
str.SetString((const char *) yarn.mYarn_Buf, yarn.mYarn_Fill);
|
||||
str.AssignWithConversion((const char *) yarn.mYarn_Buf, yarn.mYarn_Fill);
|
||||
cardCell->CutStrongRef(GetEnv()); // always release ref
|
||||
}
|
||||
else
|
||||
|
|
|
@ -349,7 +349,7 @@ NS_IMETHODIMP nsAddressBook::GetAbDatabaseFromURI(const char *uri, nsIAddrDataba
|
|||
if(NS_SUCCEEDED(rv))
|
||||
abSession->GetUserProfileDirectory(&dbPath);
|
||||
|
||||
nsString file(&(uri[PL_strlen(kDirectoryDataSourceRoot)]));
|
||||
nsString file; file.AssignWithConversion(&(uri[PL_strlen(kDirectoryDataSourceRoot)]));
|
||||
PRInt32 pos = file.Find("/");
|
||||
if (pos != -1)
|
||||
file.Truncate(pos);
|
||||
|
@ -436,7 +436,7 @@ nsresult AddressBookParser::ParseFile()
|
|||
nsAutoString fileString;
|
||||
if (mFileSpec) {
|
||||
mFileSpec->GetLeafName(&leafName);
|
||||
fileString = leafName;
|
||||
fileString.AssignWithConversion(leafName);
|
||||
// todo: detect ldif / tab files a better way
|
||||
if (-1 != fileString.Find(kTabExtension) || -1 != fileString.Find(kTxtExtension))
|
||||
mFileType = TABFile;
|
||||
|
@ -1348,7 +1348,7 @@ NS_IMETHODIMP nsAddressBook::ImportAddressBook()
|
|||
|
||||
// todo: detect na2 files a better way
|
||||
PRBool isNA2File = PR_FALSE;
|
||||
nsAutoString fileString = (const char *) leafName;
|
||||
nsAutoString fileString; fileString.AssignWithConversion((const char *) leafName);
|
||||
if (-1 != fileString.Find(".na2")) {
|
||||
isNA2File = PR_TRUE;
|
||||
}
|
||||
|
|
|
@ -285,7 +285,7 @@ PRInt32 INTL_ConvertToUnicode(const char* aBuffer, const PRInt32 aLength,
|
|||
NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res);
|
||||
if(NS_SUCCEEDED(res) && (nsnull != ccm))
|
||||
{
|
||||
nsString aCharset("UTF-8");
|
||||
nsString aCharset; aCharset.AssignWithConversion("UTF-8");
|
||||
nsIUnicodeDecoder* decoder = nsnull;
|
||||
PRUnichar *unichars;
|
||||
PRInt32 unicharLength;
|
||||
|
@ -332,7 +332,7 @@ PRInt32 INTL_ConvertFromUnicode(const void* uniBuffer, const PRInt32 uniLength,
|
|||
NS_WITH_SERVICE(nsICharsetConverterManager, ccm, kCharsetConverterManagerCID, &res);
|
||||
if(NS_SUCCEEDED(res) && (nsnull != ccm))
|
||||
{
|
||||
nsString aCharset("UTF-8");
|
||||
nsString aCharset; aCharset.AssignWithConversion("UTF-8");
|
||||
nsIUnicodeEncoder* encoder = nsnull;
|
||||
|
||||
// convert from unicode
|
||||
|
@ -414,7 +414,7 @@ static nsresult dir_ConvertToMabFileName()
|
|||
// do other address book when convert from 4.5 to mork is done
|
||||
if (server && server->position == 1 && server->fileName)
|
||||
{
|
||||
nsString name(server->fileName);
|
||||
nsString name; name.AssignWithConversion(server->fileName);
|
||||
PRInt32 pos = name.Find(ABFileName_kPreviousSuffix);
|
||||
if (pos > 0)
|
||||
{
|
||||
|
|
|
@ -527,7 +527,7 @@ nsresult nsAbDirectoryDataSource::createDirectoryUriNode(nsIAbDirectory *directo
|
|||
char *uri;
|
||||
nsresult rv = directory->GetDirUri(&uri);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
nsString nameString(uri);
|
||||
nsString nameString; nameString.AssignWithConversion(uri);
|
||||
createNode(nameString, target);
|
||||
nsAllocator::Free(uri);
|
||||
return NS_OK;
|
||||
|
|
Загрузка…
Ссылка в новой задаче