From 8b37e3ee8869111f4378601da0940421ef12ee8d Mon Sep 17 00:00:00 2001 From: "scc%mozilla.org" Date: Sat, 19 Aug 2000 21:44:26 +0000 Subject: [PATCH] fixing code that relied on implicit string construction --- modules/plugin/base/src/nsPluginHostImpl.cpp | 10 +++++----- modules/plugin/nglsrc/nsPluginHostImpl.cpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp index 3457a686826..58178f09188 100644 --- a/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -1579,7 +1579,7 @@ NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID, rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); if (NS_FAILED(rv)) return rv; - nsCAutoString path = "software/plugins/"; + nsCAutoString path("software/plugins/"); char* cid = aCID.ToString(); if (! cid) return NS_ERROR_OUT_OF_MEMORY; @@ -1619,7 +1619,7 @@ NS_IMETHODIMP nsPluginHostImpl::UnregisterPlugin(REFNSIID aCID) rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); if (NS_FAILED(rv)) return rv; - nsCAutoString path = "software/plugins/"; + nsCAutoString path("software/plugins/"); char* cid = aCID.ToString(); if (! cid) return NS_ERROR_OUT_OF_MEMORY; @@ -2138,7 +2138,7 @@ nsresult nsPluginHostImpl::RegisterPluginMimeTypesWithLayout(nsPluginTag * plugi { static NS_DEFINE_CID(kPluginDocLoaderFactoryCID, NS_PLUGINDOCLOADERFACTORY_CID); - nsCAutoString progid = NS_DOCUMENT_LOADER_FACTORY_PROGID_PREFIX "view/"; + nsCAutoString progid(NS_DOCUMENT_LOADER_FACTORY_PROGID_PREFIX "view/"); progid += pluginTag->mMimeTypeArray[i]; rv = compManager->RegisterComponentSpec(kPluginDocLoaderFactoryCID, @@ -2952,8 +2952,8 @@ LoadXPCOMPlugin(nsIComponentManager* aComponentManager, // To figure out the filename of the plugin, we'll need to get the // plugin's CID, and then navigate through the XPCOM registry to // pull out the DLL name to which the CID is registered. - nsAutoString path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/"); - path += NS_ConvertASCIItoUCS2(aCID); + nsAutoString path; + path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/") + NS_ConvertASCIItoUCS2(aCID); nsRegistryKey cidKey; rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey); diff --git a/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/modules/plugin/nglsrc/nsPluginHostImpl.cpp index 3457a686826..58178f09188 100644 --- a/modules/plugin/nglsrc/nsPluginHostImpl.cpp +++ b/modules/plugin/nglsrc/nsPluginHostImpl.cpp @@ -1579,7 +1579,7 @@ NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID, rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); if (NS_FAILED(rv)) return rv; - nsCAutoString path = "software/plugins/"; + nsCAutoString path("software/plugins/"); char* cid = aCID.ToString(); if (! cid) return NS_ERROR_OUT_OF_MEMORY; @@ -1619,7 +1619,7 @@ NS_IMETHODIMP nsPluginHostImpl::UnregisterPlugin(REFNSIID aCID) rv = registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); if (NS_FAILED(rv)) return rv; - nsCAutoString path = "software/plugins/"; + nsCAutoString path("software/plugins/"); char* cid = aCID.ToString(); if (! cid) return NS_ERROR_OUT_OF_MEMORY; @@ -2138,7 +2138,7 @@ nsresult nsPluginHostImpl::RegisterPluginMimeTypesWithLayout(nsPluginTag * plugi { static NS_DEFINE_CID(kPluginDocLoaderFactoryCID, NS_PLUGINDOCLOADERFACTORY_CID); - nsCAutoString progid = NS_DOCUMENT_LOADER_FACTORY_PROGID_PREFIX "view/"; + nsCAutoString progid(NS_DOCUMENT_LOADER_FACTORY_PROGID_PREFIX "view/"); progid += pluginTag->mMimeTypeArray[i]; rv = compManager->RegisterComponentSpec(kPluginDocLoaderFactoryCID, @@ -2952,8 +2952,8 @@ LoadXPCOMPlugin(nsIComponentManager* aComponentManager, // To figure out the filename of the plugin, we'll need to get the // plugin's CID, and then navigate through the XPCOM registry to // pull out the DLL name to which the CID is registered. - nsAutoString path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/"); - path += NS_ConvertASCIItoUCS2(aCID); + nsAutoString path; + path = NS_LITERAL_STRING("software/mozilla/XPCOM/classID/") + NS_ConvertASCIItoUCS2(aCID); nsRegistryKey cidKey; rv = aRegistry->GetKey(nsIRegistry::Common, path.GetUnicode(), &cidKey);