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

update to sync with nsString2

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@28678 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rickg%netscape.com 1999-04-22 06:39:40 +00:00
parent d155b4330b
commit b7a4f49f23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/mailnews/base/src/nsMsgAppCore.cpp
View File

@ -510,7 +510,7 @@ nsMsgAppCore::SetWindow(nsIDOMWindow* aWin)
webShell->GetRootWebShell(rootWebShell);
if (nsnull != rootWebShell)
{
rootWebShell->FindChildWithName(webShellName, mWebShell);
rootWebShell->FindChildWithName(webShellName.GetUnicode(), mWebShell);
#ifdef NS_DEBUG
if (nsnull != mWebShell)
printf("nsMsgAppCore::SetWindow(): Got the webShell %s.\n", webShellName.ToNewCString());
@ -818,7 +818,7 @@ nsMsgAppCore::NewFolder(nsIRDFCompositeDataSource *database, nsIDOMXULElement *p
nsIRDFLiteral *nameLiteral;
nsIRDFResource *newFolderResource;
gRDFService->GetLiteral(nameStr, &nameLiteral);
gRDFService->GetLiteral(nameStr.GetUnicode(), &nameLiteral);
nameArray->AppendElement(nameLiteral);
if(NS_SUCCEEDED(rv = gRDFService->GetResource("http://home.netscape.com/NC-rdf#NewFolder", &newFolderResource)))
{

2
mozilla/mailnews/base/src/nsMsgRDFUtils.cpp
View File

@ -83,7 +83,7 @@ void createNode(nsString& str, nsIRDFNode **node)
NS_WITH_SERVICE(nsIRDFService, rdf, kRDFServiceCID, &rv);
if (NS_FAILED(rv)) return; // always check this before proceeding
nsIRDFLiteral * value;
if(NS_SUCCEEDED(rdf->GetLiteral((const PRUnichar*)str, &value))) {
if(NS_SUCCEEDED(rdf->GetLiteral(str.GetUnicode(), &value))) {
*node = value;
}
}

4
mozilla/mailnews/compose/src/nsSmtpUrl.cpp
View File

@ -696,7 +696,7 @@ nsresult nsSmtpUrl::GetUserPassword(const nsString ** aUserPassword)
nsresult nsSmtpUrl::SetUserEmailAddress(const nsString& aUserName)
{
nsresult rv = NS_OK;
if (aUserName)
if (aUserName.GetUnicode())
{
m_userName = aUserName;
if (m_userNameString)
@ -710,7 +710,7 @@ nsresult nsSmtpUrl::SetUserEmailAddress(const nsString& aUserName)
nsresult nsSmtpUrl::SetUserPassword(const nsString& aUserPassword)
{
nsresult rv = NS_OK;
if (aUserPassword)
if (aUserPassword.GetUnicode())
{
m_userPassword = aUserPassword;
}

2
mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
View File

@ -2360,7 +2360,7 @@ nsMsgHdr * nsMsgDatabase::GetMsgHdrForMessageID(nsString2 &msgID)
nsString messageId;
(void)pHeader->GetMessageId(messageId);
if (msgID.Equals(messageId, PR_FALSE))
if (msgID.Equals(messageId.GetUnicode(), PR_FALSE))
break;
NS_RELEASE(pHeader);
pHeader = nsnull;

2
mozilla/mailnews/local/src/nsMailboxProtocol.cpp
View File

@ -207,7 +207,7 @@ NS_IMETHODIMP nsMailboxProtocol::OnStopBinding(nsIURL* aURL, nsresult aStatus, c
nsFileURL fileURL(filePath);
char * message_path_url = PL_strdup(fileURL.GetAsString());
m_displayConsumer->LoadURL(nsAutoString(message_path_url), nsnull, PR_TRUE, nsURLReload, 0);
m_displayConsumer->LoadURL(nsAutoString(message_path_url).GetUnicode(), nsnull, PR_TRUE, nsURLReload, 0);
PR_FREEIF(message_path_url);
}

2
mozilla/mailnews/news/src/nsNNTPProtocol.cpp
View File

@ -2052,7 +2052,7 @@ PRInt32 nsNNTPProtocol::ReadArticle(nsIInputStream * inputStream, PRUint32 lengt
// to load the webshell!
// mWebShell->LoadURL(nsAutoString("http://www.netscape.com"),
// nsnull, PR_TRUE, nsURLReload, 0);
m_displayConsumer->LoadURL(nsAutoString(fileUrl), nsnull, PR_TRUE, nsURLReload, 0);
m_displayConsumer->LoadURL(nsAutoString(fileUrl).GetUnicode(), nsnull, PR_TRUE, nsURLReload, 0);
}
// mscott: we may need to release our reference on the url....