mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-29 15:52:07 +00:00
Remove nsCStringKey-related bustage fixes from this morning that are no longer needed. r=jaggernaut sr=waterson b=88411
This commit is contained in:
parent
d4fabc2675
commit
d5460d02ef
@ -588,7 +588,7 @@ nsMsgAccountManager::RemoveAccount(nsIMsgAccount *aAccount)
|
||||
}
|
||||
}
|
||||
|
||||
nsCStringKey hashKey(serverKey.get());
|
||||
nsCStringKey hashKey(serverKey);
|
||||
|
||||
nsIMsgIncomingServer* removedServer =
|
||||
(nsIMsgIncomingServer*) m_incomingServers.Remove(&hashKey);
|
||||
|
@ -1199,7 +1199,7 @@ nsZipReaderCache::GetZip(nsIFile* zipFile, nsIZipReader* *result)
|
||||
rv = zipFile->GetPath(getter_Copies(path));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
nsCStringKey key(path.get());
|
||||
nsCStringKey key(path);
|
||||
nsJAR* zip = NS_STATIC_CAST(nsJAR*, NS_STATIC_CAST(nsIZipReader*,mZips.Get(&key))); // AddRefs
|
||||
if (zip) {
|
||||
#ifdef ZIP_CACHE_HIT_RATE
|
||||
@ -1323,7 +1323,7 @@ nsZipReaderCache::ReleaseZip(nsJAR* zip)
|
||||
rv = zipFile->GetPath(getter_Copies(path));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
nsCStringKey key(path.get());
|
||||
nsCStringKey key(path);
|
||||
PRBool removed = mZips.Remove(&key); // Releases
|
||||
NS_ASSERTION(removed, "botched");
|
||||
|
||||
|
@ -163,7 +163,7 @@ nsXMLMIMEDataSource::Add( nsIMIMEInfo* aMapper )
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
// Next add the new root MIME mapping.
|
||||
nsCStringKey key(mimeType.get());
|
||||
nsCStringKey key(mimeType);
|
||||
nsMIMEInfoImpl* oldInfo = (nsMIMEInfoImpl*)mInfoObjects->Put(&key, aMapper);
|
||||
NS_ASSERTION(!oldInfo, "we just removed the entry, we shouldn't have one");
|
||||
NS_ADDREF(aMapper);
|
||||
|
@ -192,7 +192,7 @@ nsFtpProtocolHandler::RemoveConnection(nsIURI *aKey, nsISupports* *_retval) {
|
||||
nsXPIDLCString spec;
|
||||
aKey->GetPrePath(getter_Copies(spec));
|
||||
|
||||
nsCStringKey stringKey(spec.get());
|
||||
nsCStringKey stringKey(spec);
|
||||
|
||||
// Do not have to addRef since there is only one connection (with this key)
|
||||
// in this hash table at any time and that one has been addRef'ed
|
||||
@ -217,7 +217,7 @@ nsFtpProtocolHandler::InsertConnection(nsIURI *aKey, nsISupports *aConn) {
|
||||
|
||||
nsXPIDLCString spec;
|
||||
aKey->GetPrePath(getter_Copies(spec));
|
||||
nsCStringKey stringKey(spec.get());
|
||||
nsCStringKey stringKey(spec);
|
||||
|
||||
if (mRootConnectionList)
|
||||
{
|
||||
|
@ -1482,7 +1482,7 @@ nsresult nsExternalHelperAppService::AddMimeInfoToCache(nsIMIMEInfo * aMIMEInfo)
|
||||
nsXPIDLCString mimeType;
|
||||
aMIMEInfo->GetMIMEType(getter_Copies(mimeType));
|
||||
|
||||
nsCStringKey key(mimeType.get());
|
||||
nsCStringKey key(mimeType);
|
||||
nsIMIMEInfo * oldInfo = (nsIMIMEInfo*)mMimeInfoCache->Put(&key, aMIMEInfo);
|
||||
|
||||
// add a reference for the hash table entry....
|
||||
|
@ -786,7 +786,7 @@ nsNativeComponentLoader::AutoRegisterComponent(PRInt32 when,
|
||||
if (NS_FAILED(rv))
|
||||
return rv;
|
||||
|
||||
nsCStringKey key(persistentDescriptor.get());
|
||||
nsCStringKey key(persistentDescriptor);
|
||||
|
||||
// Get the registry representation of the dll, if any
|
||||
nsDll *dll;
|
||||
|
Loading…
Reference in New Issue
Block a user