From 1f1ce365e8c0ff34227c1c118242f6e2fd16ca9d Mon Sep 17 00:00:00 2001 From: "blizzard%redhat.com" Date: Thu, 30 Dec 1999 22:03:58 +0000 Subject: [PATCH] Change nsComponentManager::ProgIDToCLSID to nsComponentManager::ProgIDToClassID as per bug #3579. Checking in for sford. r=scc,r=blizzard git-svn-id: svn://10.0.0.236/trunk@56630 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xsl/document/src/nsTransformMediator.cpp | 2 +- mozilla/docshell/base/nsWebShell.cpp | 2 +- mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp | 2 +- mozilla/js/src/xpconnect/src/xpcjsid.cpp | 2 +- mozilla/layout/xsl/document/src/nsTransformMediator.cpp | 2 +- mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp | 2 +- mozilla/mailnews/mime/src/mimei.cpp | 2 +- mozilla/rdf/base/src/nsRDFService.cpp | 2 +- mozilla/webshell/embed/gtk/lib/GtkMozillaContainer.cpp | 2 +- mozilla/webshell/src/nsWebShell.cpp | 2 +- mozilla/xpcom/components/nsComponentManager.cpp | 8 ++++---- mozilla/xpcom/components/nsComponentManagerUtils.h | 2 +- mozilla/xpcom/components/nsIComponentManager.idl | 2 +- mozilla/xpcom/components/nsRepository.cpp | 4 ++-- mozilla/xpcom/components/nsServiceManager.cpp | 8 ++++---- mozilla/xpcom/glue/nsComponentManagerUtils.h | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/mozilla/content/xsl/document/src/nsTransformMediator.cpp b/mozilla/content/xsl/document/src/nsTransformMediator.cpp index 207b7533d0d..6dfc9871bfd 100644 --- a/mozilla/content/xsl/document/src/nsTransformMediator.cpp +++ b/mozilla/content/xsl/document/src/nsTransformMediator.cpp @@ -88,7 +88,7 @@ nsTransformMediator::Init(const nsString& aMimeType) if (NS_SUCCEEDED(rv)) { nsCID cid; char* progIDStr = (char*)progID.ToNewCString(); - rv = nsComponentManager::ProgIDToCLSID((const char*)progIDStr, &cid); + rv = nsComponentManager::ProgIDToClassID((const char*)progIDStr, &cid); if (NS_SUCCEEDED(rv)) { // Try to find a component that implements the nsIDocumentTransformer interface rv = nsComponentManager::CreateInstance(cid, nsnull, diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index 55b33eb3352..55d55851d68 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -1763,7 +1763,7 @@ nsresult nsWebShell::CreateViewer(nsIChannel* aChannel, aCommand ? aCommand : "view",/* XXX bug! shouldn't b needed!*/ aContentType); - rv = nsComponentManager::ProgIDToCLSID(id, &cid); + rv = nsComponentManager::ProgIDToClassID(id, &cid); if (NS_SUCCEEDED(rv)) { // Create an instance of the document-loader-factory object nsIDocumentLoaderFactory* factory; diff --git a/mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp b/mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp index a41f7fd2514..116359656db 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTermStream.cpp @@ -283,7 +283,7 @@ NS_IMETHODIMP mozXMLTermStream::Open(nsIDOMWindow* aDOMWindow, progID += "/"; progID += contentType; - result = nsComponentManager::ProgIDToCLSID(progID.GetBuffer(), + result = nsComponentManager::ProgIDToClassID(progID.GetBuffer(), &classID); if (NS_FAILED(result)) return result; diff --git a/mozilla/js/src/xpconnect/src/xpcjsid.cpp b/mozilla/js/src/xpconnect/src/xpcjsid.cpp index f79811e33e9..e5015b5fbc4 100644 --- a/mozilla/js/src/xpconnect/src/xpcjsid.cpp +++ b/mozilla/js/src/xpconnect/src/xpcjsid.cpp @@ -949,7 +949,7 @@ nsJSCID::NewID(const char* str) else { nsCID cid; - if(NS_SUCCEEDED(nsComponentManager::ProgIDToCLSID(str, &cid))) + if(NS_SUCCEEDED(nsComponentManager::ProgIDToClassID(str, &cid))) { success = idObj->mDetails.InitWithName(cid, str); } diff --git a/mozilla/layout/xsl/document/src/nsTransformMediator.cpp b/mozilla/layout/xsl/document/src/nsTransformMediator.cpp index 207b7533d0d..6dfc9871bfd 100644 --- a/mozilla/layout/xsl/document/src/nsTransformMediator.cpp +++ b/mozilla/layout/xsl/document/src/nsTransformMediator.cpp @@ -88,7 +88,7 @@ nsTransformMediator::Init(const nsString& aMimeType) if (NS_SUCCEEDED(rv)) { nsCID cid; char* progIDStr = (char*)progID.ToNewCString(); - rv = nsComponentManager::ProgIDToCLSID((const char*)progIDStr, &cid); + rv = nsComponentManager::ProgIDToClassID((const char*)progIDStr, &cid); if (NS_SUCCEEDED(rv)) { // Try to find a component that implements the nsIDocumentTransformer interface rv = nsComponentManager::CreateInstance(cid, nsnull, diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp index 34c1dbf7934..f5e030fc93e 100644 --- a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp +++ b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp @@ -227,7 +227,7 @@ nsMimeXULEmitter::GetStatusObjForProgID(nsCString aProgID) return nsnull; nsCID cid; - rv = comMgr->ProgIDToCLSID(aProgID, &cid); + rv = comMgr->ProgIDToClassID(aProgID, &cid); if (NS_FAILED(rv)) return nsnull; diff --git a/mozilla/mailnews/mime/src/mimei.cpp b/mozilla/mailnews/mime/src/mimei.cpp index 1ff1145202c..f635b30da47 100644 --- a/mozilla/mailnews/mime/src/mimei.cpp +++ b/mozilla/mailnews/mime/src/mimei.cpp @@ -193,7 +193,7 @@ mime_locate_external_content_handler(const char *content_type, nsresult rv = NS_OK; PR_snprintf(lookupID, sizeof(lookupID), "mimecth:%s", content_type); - if (nsComponentManager::ProgIDToCLSID(lookupID, &classID) != NS_OK) + if (nsComponentManager::ProgIDToClassID(lookupID, &classID) != NS_OK) return NULL; rv = nsComponentManager::CreateInstance(classID, (nsISupports *)nsnull, kIMimeContentTypeHandlerIID, diff --git a/mozilla/rdf/base/src/nsRDFService.cpp b/mozilla/rdf/base/src/nsRDFService.cpp index d1df65fcdf4..14ecec733a8 100644 --- a/mozilla/rdf/base/src/nsRDFService.cpp +++ b/mozilla/rdf/base/src/nsRDFService.cpp @@ -625,7 +625,7 @@ RDFServiceImpl::GetResource(const char* aURI, nsIRDFResource** aResource) progID[len] = '\0'; nsCID cid; - rv = nsComponentManager::ProgIDToCLSID(progID, &cid); + rv = nsComponentManager::ProgIDToClassID(progID, &cid); if (progID != buf) nsCRT::free(progID); diff --git a/mozilla/webshell/embed/gtk/lib/GtkMozillaContainer.cpp b/mozilla/webshell/embed/gtk/lib/GtkMozillaContainer.cpp index 0ec61aa8e4a..7f4141d171f 100644 --- a/mozilla/webshell/embed/gtk/lib/GtkMozillaContainer.cpp +++ b/mozilla/webshell/embed/gtk/lib/GtkMozillaContainer.cpp @@ -347,7 +347,7 @@ GtkMozillaContainer::CreateContentViewer(const char *aCommand, PR_snprintf(id, sizeof(id), NS_DOCUMENT_LOADER_FACTORY_PROGID_PREFIX "%s/%s", aCommand, aContentType); - nsresult rv = nsComponentManager::ProgIDToCLSID(id, &cid); + nsresult rv = nsComponentManager::ProgIDToClassID(id, &cid); if (NS_FAILED(rv)) { return rv; } diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp index 55b33eb3352..55d55851d68 100644 --- a/mozilla/webshell/src/nsWebShell.cpp +++ b/mozilla/webshell/src/nsWebShell.cpp @@ -1763,7 +1763,7 @@ nsresult nsWebShell::CreateViewer(nsIChannel* aChannel, aCommand ? aCommand : "view",/* XXX bug! shouldn't b needed!*/ aContentType); - rv = nsComponentManager::ProgIDToCLSID(id, &cid); + rv = nsComponentManager::ProgIDToClassID(id, &cid); if (NS_SUCCEEDED(rv)) { // Create an instance of the document-loader-factory object nsIDocumentLoaderFactory* factory; diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp index c8d1e9d9b12..52261d5e133 100644 --- a/mozilla/xpcom/components/nsComponentManager.cpp +++ b/mozilla/xpcom/components/nsComponentManager.cpp @@ -1114,13 +1114,13 @@ nsComponentManagerImpl::GetClassObject(const nsCID &aClass, const nsIID &aIID, } /** - * ProgIDToCLSID() + * ProgIDToClassID() * * Mapping function from a ProgID to a classID. Directly talks to the registry. * */ nsresult -nsComponentManagerImpl::ProgIDToCLSID(const char *aProgID, nsCID *aClass) +nsComponentManagerImpl::ProgIDToClassID(const char *aProgID, nsCID *aClass) { NS_PRECONDITION(aProgID != NULL, "null ptr"); if (! aProgID) @@ -1178,7 +1178,7 @@ nsComponentManagerImpl::ProgIDToCLSID(const char *aProgID, nsCID *aClass) if (NS_SUCCEEDED(res)) buf = aClass->ToString(); PR_LOG(nsComponentManagerLog, PR_LOG_ALWAYS, - ("nsComponentManager: ProgIDToCLSID(%s)->%s", aProgID, + ("nsComponentManager: ProgIDToClassID(%s)->%s", aProgID, NS_SUCCEEDED(res) ? buf : "[FAILED]")); if (NS_SUCCEEDED(res)) delete [] buf; @@ -1271,7 +1271,7 @@ nsComponentManagerImpl::CreateInstanceByProgID(const char *aProgID, void **aResult) { nsCID clsid; - nsresult rv = ProgIDToCLSID(aProgID, &clsid); + nsresult rv = ProgIDToClassID(aProgID, &clsid); if (NS_FAILED(rv)) return rv; return CreateInstance(clsid, aDelegate, aIID, aResult); } diff --git a/mozilla/xpcom/components/nsComponentManagerUtils.h b/mozilla/xpcom/components/nsComponentManagerUtils.h index 1a753410da4..dd876cb5359 100644 --- a/mozilla/xpcom/components/nsComponentManagerUtils.h +++ b/mozilla/xpcom/components/nsComponentManagerUtils.h @@ -78,7 +78,7 @@ public: void **aResult); // Finds a class ID for a specific Program ID - static nsresult ProgIDToCLSID(const char *aProgID, + static nsresult ProgIDToClassID(const char *aProgID, nsCID *aClass); // Finds a Program ID for a specific class ID diff --git a/mozilla/xpcom/components/nsIComponentManager.idl b/mozilla/xpcom/components/nsIComponentManager.idl index ef436c74395..401ef50cf43 100644 --- a/mozilla/xpcom/components/nsIComponentManager.idl +++ b/mozilla/xpcom/components/nsIComponentManager.idl @@ -30,7 +30,7 @@ interface nsIComponentManager : nsISupports nsIFactory findFactory(in nsCIDRef aClass); [noscript] voidStar getClassObject(in nsCIDRef aClass, in nsIIDRef aIID); - [noscript] void progIDToCLSID(in string aProgID, out nsCID aClass); + [noscript] void progIDToClassID(in string aProgID, out nsCID aClass); string CLSIDToProgID(in nsCIDRef aClass, out string aClassName); [noscript] voidStar createInstance(in nsCIDRef aClass, diff --git a/mozilla/xpcom/components/nsRepository.cpp b/mozilla/xpcom/components/nsRepository.cpp index c3600747103..a1389ec315e 100644 --- a/mozilla/xpcom/components/nsRepository.cpp +++ b/mozilla/xpcom/components/nsRepository.cpp @@ -49,13 +49,13 @@ nsComponentManager::GetClassObject(const nsCID &aClass, const nsIID &aIID, } nsresult -nsComponentManager::ProgIDToCLSID(const char *aProgID, +nsComponentManager::ProgIDToClassID(const char *aProgID, nsCID *aClass) { nsIComponentManager* cm; nsresult rv = NS_GetGlobalComponentManager(&cm); if (NS_FAILED(rv)) return rv; - return cm->ProgIDToCLSID(aProgID, aClass); + return cm->ProgIDToClassID(aProgID, aClass); } nsresult diff --git a/mozilla/xpcom/components/nsServiceManager.cpp b/mozilla/xpcom/components/nsServiceManager.cpp index 030ab05b8f8..05ebe3f1890 100644 --- a/mozilla/xpcom/components/nsServiceManager.cpp +++ b/mozilla/xpcom/components/nsServiceManager.cpp @@ -411,7 +411,7 @@ nsServiceManagerImpl::RegisterService(const char* aProgID, nsISupports* aService { nsCID aClass; nsresult rv; - rv = nsComponentManager::ProgIDToCLSID(aProgID, &aClass); + rv = nsComponentManager::ProgIDToClassID(aProgID, &aClass); if (NS_FAILED(rv)) return rv; return RegisterService(aClass, aService); } @@ -421,7 +421,7 @@ nsServiceManagerImpl::UnregisterService(const char* aProgID) { nsCID aClass; nsresult rv; - rv = nsComponentManager::ProgIDToCLSID(aProgID, &aClass); + rv = nsComponentManager::ProgIDToClassID(aProgID, &aClass); if (NS_FAILED(rv)) return rv; return UnregisterService(aClass); } @@ -433,7 +433,7 @@ nsServiceManagerImpl::GetService(const char* aProgID, const nsIID& aIID, { nsCID aClass; nsresult rv; - rv = nsComponentManager::ProgIDToCLSID(aProgID, &aClass); + rv = nsComponentManager::ProgIDToClassID(aProgID, &aClass); if (NS_FAILED(rv)) return rv; return GetService(aClass, aIID, result, shutdownListener); } @@ -444,7 +444,7 @@ nsServiceManagerImpl::ReleaseService(const char* aProgID, nsISupports* service, { nsCID aClass; nsresult rv; - rv = nsComponentManager::ProgIDToCLSID(aProgID, &aClass); + rv = nsComponentManager::ProgIDToClassID(aProgID, &aClass); if (NS_FAILED(rv)) return rv; return ReleaseService(aClass, service, shutdownListener); } diff --git a/mozilla/xpcom/glue/nsComponentManagerUtils.h b/mozilla/xpcom/glue/nsComponentManagerUtils.h index 1a753410da4..dd876cb5359 100644 --- a/mozilla/xpcom/glue/nsComponentManagerUtils.h +++ b/mozilla/xpcom/glue/nsComponentManagerUtils.h @@ -78,7 +78,7 @@ public: void **aResult); // Finds a class ID for a specific Program ID - static nsresult ProgIDToCLSID(const char *aProgID, + static nsresult ProgIDToClassID(const char *aProgID, nsCID *aClass); // Finds a Program ID for a specific class ID