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

git-svn-id: svn://10.0.0.236/trunk@106248 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com
2001-10-25 05:10:08 +00:00
parent 18b8171d1a
commit adf0bd9e66
2 changed files with 4 additions and 4 deletions

View File

@@ -302,7 +302,7 @@ nsresult nsAutoConfig::downloadAutoConfig()
if (NS_SUCCEEDED(rv) && appendMail) {
rv = getEmailAddr(emailAddr);
if (NS_SUCCEEDED(rv) && emailAddr) {
if (NS_SUCCEEDED(rv) && emailAddr.get()) {
/* Adding the unique identifier at the end of autoconfig URL.
In this case the autoconfig URL is a script and
@@ -317,7 +317,7 @@ nsresult nsAutoConfig::downloadAutoConfig()
nsCOMPtr<nsIURI> url;
nsCOMPtr<nsIChannel> channel;
rv = NS_NewURI(getter_AddRefs(url), mConfigURL, nsnull, nsnull);
rv = NS_NewURI(getter_AddRefs(url), mConfigURL.get(), nsnull, nsnull);
if (NS_FAILED(rv))
return rv;
@@ -544,7 +544,7 @@ nsresult nsAutoConfig::getEmailAddr(nsAWritableCString & emailAddr)
emailAddr = nsDependentCString(prefValue, len);
}
else {
if (mCurrProfile) {
if (mCurrProfile.get()) { // XXXjag this is always non-null. Did you mean !IsEmpty()?
emailAddr = mCurrProfile;
}
}

View File

@@ -720,7 +720,7 @@ void nsPrefBranch::freeObserverList(void)
pCallback = (PrefCallbackData *)mObservers->ElementAt(i);
if (pCallback) {
mObserverDomains.CStringAt(i, domain);
PREF_UnregisterCallback(domain, NotifyObserver, pCallback);
PREF_UnregisterCallback(domain.get(), NotifyObserver, pCallback);
NS_RELEASE(pCallback->pObserver);
nsMemory::Free(pCallback);
}