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

remove *WithConversion from mac embedding code

Browse Source 
261241 r=pink sr=darin


git-svn-id: svn://10.0.0.236/trunk@163004 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cbiesinger%web.de 2004-09-30 14:17:28 +00:00
parent 7c12aabd2e
commit fabaef24fb
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/embedding/browser/cocoa/src/CHBrowserView.mm
View File

@ -570,9 +570,8 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1";
nsAutoString urlStr; nsAutoString urlStr;
location->GetHref(urlStr); location->GetHref(urlStr);
#warning fix me #warning fix me
nsCAutoString urlCStr; urlCStr.AssignWithConversion(urlStr);
nsCOMPtr<nsIURI> url; nsCOMPtr<nsIURI> url;
nsresult rv = NS_NewURI(getter_AddRefs(url), urlCStr.get()); nsresult rv = NS_NewURI(getter_AddRefs(url), urlStr);
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return; return;

10
mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.cpp
View File

@ -279,17 +279,15 @@ NS_IMETHODIMP CWebBrowserChrome::OnLocationChange(nsIWebProgress* aWebProgress,
{ {
NS_ENSURE_TRUE(mBrowserWindow, NS_OK); NS_ENSURE_TRUE(mBrowserWindow, NS_OK);
char *buf = nsnull;
nsCAutoString buf;
if (location) if (location)
location->GetSpec(&buf); location->GetSpec(buf);
nsAutoString tmp; tmp.AssignWithConversion(buf); nsAutoString tmp;
CopyUTF8toUTF16(buf, tmp);
mBrowserWindow->SetLocation(tmp); mBrowserWindow->SetLocation(tmp);
if (buf)
Recycle(buf);
return NS_OK; return NS_OK;
} }