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

Bug 53057: Fixing up users of implicit |CharT*| conversion operators for nsCString to use |.get()| instead, rr=dbaron, rs=scc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@106466 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com
2001-10-27 08:09:28 +00:00
parent 2aa4dfe1f7
commit 894154f57b
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/embedding/browser/gtk/src/EmbedStream.cpp
View File

@@ -139,7 +139,7 @@ EmbedStream::OpenStream(const char *aBaseURI, const char *aContentType)
docLoaderContractID += aContentType;
nsCOMPtr<nsIDocumentLoaderFactory> docLoaderFactory;
docLoaderFactory = do_CreateInstance(docLoaderContractID, &rv);
docLoaderFactory = do_CreateInstance(docLoaderContractID.get(), &rv);
if (NS_FAILED(rv))
return rv;

8
mozilla/embedding/browser/webBrowser/nsWebBrowserPersist.cpp
View File

@@ -972,7 +972,7 @@ nsWebBrowserPersist::EnumPersistURIs(nsHashKey *aKey, void *aData, void* closure
rv = data->mDataPath->Clone(getter_AddRefs(fileAsFile));
NS_ENSURE_SUCCESS(rv, PR_FALSE);
nsCOMPtr<nsILocalFile> file = do_QueryInterface(fileAsFile);
file->AppendRelativePath(filename);
file->AppendRelativePath(filename.get());
rv = pthis->SaveURIInternal(uri, nsnull, file, PR_TRUE);
NS_ENSURE_SUCCESS(rv, PR_FALSE);
@@ -1207,7 +1207,7 @@ nsWebBrowserPersist::StoreURIAttribute(
attrNode->GetNodeValue(oldValue);
nsCString oldCValue; oldCValue.AssignWithConversion(oldValue);
URIData *data = nsnull;
MakeAndStoreLocalFilenameInURIMap(oldCValue, aNeedsPersisting, &data);
MakeAndStoreLocalFilenameInURIMap(oldCValue.get(), aNeedsPersisting, &data);
if (aData)
{
*aData = data;
@@ -1270,7 +1270,7 @@ nsWebBrowserPersist::FixupNodeAttribute(nsIDOMNode *aNode, char *aAttribute)
nsCAutoString rawPathURL;
rawPathURL.Assign(data->mRelativePathToData);
rawPathURL.Append(filename.get());
newValue.AssignWithConversion(nsEscape(rawPathURL, url_Path));
newValue.AssignWithConversion(nsEscape(rawPathURL.get(), url_Path));
}
else
{
@@ -1407,7 +1407,7 @@ nsWebBrowserPersist::SaveDocumentToFileWithFixup(
nsCAutoString contractID(NS_DOC_ENCODER_CONTRACTID_BASE);
contractID.AppendWithConversion(aFormatType);
nsCOMPtr<nsIDocumentEncoder> encoder = do_CreateInstance(contractID, &rv);
nsCOMPtr<nsIDocumentEncoder> encoder = do_CreateInstance(contractID.get(), &rv);
if (NS_FAILED(rv))
return rv;

6
mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp
View File

@@ -505,7 +505,7 @@ nsWindowWatcher::OpenWindowJS(nsIDOMWindow *aParent,
featuresSpecified = PR_TRUE;
}
chromeFlags = CalculateChromeFlags(features, featuresSpecified, aDialog);
chromeFlags = CalculateChromeFlags(features.get(), featuresSpecified, aDialog);
// try to find an extant window with the given name
if (nameSpecified) {
@@ -602,7 +602,7 @@ nsWindowWatcher::OpenWindowJS(nsIDOMWindow *aParent,
/* at the moment, the strings "height=" or "width=" never happen
outside a size specification, so we can do this the Q&D way. */
if (PL_strcasestr(features, "width=") || PL_strcasestr(features, "height=")) {
if (PL_strcasestr(features.get(), "width=") || PL_strcasestr(features.get(), "height=")) {
nsCOMPtr<nsIDocShellTreeOwner> newTreeOwner;
newDocShellItem->GetTreeOwner(getter_AddRefs(newTreeOwner));
@@ -699,7 +699,7 @@ nsWindowWatcher::OpenWindowJS(nsIDOMWindow *aParent,
}
if (windowIsNew)
SizeOpenedDocShellItem(newDocShellItem, aParent, features, chromeFlags);
SizeOpenedDocShellItem(newDocShellItem, aParent, features.get(), chromeFlags);
if (windowIsModal) {
nsCOMPtr<nsIDocShellTreeOwner> newTreeOwner;