From fabaef24fb2d64aecdaadc64333ea59cbb3d3dbb Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Thu, 30 Sep 2004 14:17:28 +0000 Subject: [PATCH] remove *WithConversion from mac embedding code 261241 r=pink sr=darin git-svn-id: svn://10.0.0.236/trunk@163004 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/browser/cocoa/src/CHBrowserView.mm | 3 +-- .../browser/powerplant/source/CWebBrowserChrome.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/mozilla/embedding/browser/cocoa/src/CHBrowserView.mm b/mozilla/embedding/browser/cocoa/src/CHBrowserView.mm index 5256e254304..0f75bdb1ac6 100644 --- a/mozilla/embedding/browser/cocoa/src/CHBrowserView.mm +++ b/mozilla/embedding/browser/cocoa/src/CHBrowserView.mm @@ -570,9 +570,8 @@ const char kDirServiceContractID[] = "@mozilla.org/file/directory_service;1"; nsAutoString urlStr; location->GetHref(urlStr); #warning fix me - nsCAutoString urlCStr; urlCStr.AssignWithConversion(urlStr); nsCOMPtr url; - nsresult rv = NS_NewURI(getter_AddRefs(url), urlCStr.get()); + nsresult rv = NS_NewURI(getter_AddRefs(url), urlStr); if (NS_FAILED(rv)) return; diff --git a/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.cpp b/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.cpp index 5b133fedc0c..32715a1091c 100644 --- a/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.cpp +++ b/mozilla/embedding/browser/powerplant/source/CWebBrowserChrome.cpp @@ -279,17 +279,15 @@ NS_IMETHODIMP CWebBrowserChrome::OnLocationChange(nsIWebProgress* aWebProgress, { NS_ENSURE_TRUE(mBrowserWindow, NS_OK); - char *buf = nsnull; + nsCAutoString buf; if (location) - location->GetSpec(&buf); + location->GetSpec(buf); - nsAutoString tmp; tmp.AssignWithConversion(buf); + nsAutoString tmp; + CopyUTF8toUTF16(buf, tmp); mBrowserWindow->SetLocation(tmp); - if (buf) - Recycle(buf); - return NS_OK; }