From 0cc4ea2497532f52c86b6ad8e3235d33defc8288 Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Sat, 9 Dec 2000 04:21:51 +0000 Subject: [PATCH] Fix incorrect usage of nsCOMPtr where nsCOMPtr::operator& was used instead of getter_AddRefs. b=59414 r=disttsc@bart.nl sr=waterson@netscape.com git-svn-id: svn://10.0.0.236/trunk@83442 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/src/nsDocument.cpp | 6 +---- .../xsl/document/src/nsTransformMediator.cpp | 3 +-- .../xul/templates/src/nsXULSortService.cpp | 3 +-- mozilla/docshell/base/nsWebShell.cpp | 3 +-- mozilla/editor/base/nsEditorShell.cpp | 7 ++---- mozilla/editor/composer/src/nsEditorShell.cpp | 7 ++---- mozilla/htmlparser/src/nsExpatTokenizer.cpp | 10 ++++---- .../src/nsHTMLContentSinkStream.cpp | 7 ++---- .../htmlparser/src/nsHTMLToTXTSinkStream.cpp | 7 ++---- mozilla/layout/base/src/nsDocument.cpp | 6 +---- mozilla/layout/generic/nsFrame.cpp | 6 +---- mozilla/layout/generic/nsTextFrame.cpp | 10 ++------ mozilla/layout/html/base/src/nsFrame.cpp | 6 +---- mozilla/layout/html/base/src/nsTextFrame.cpp | 10 ++------ .../xsl/document/src/nsTransformMediator.cpp | 3 +-- .../mailnews/local/src/nsLocalMailFolder.cpp | 7 +++--- mozilla/mailnews/news/src/nsNewsFolder.cpp | 7 +++--- .../htmlparser/src/nsExpatTokenizer.cpp | 10 ++++---- .../src/nsHTMLContentSinkStream.cpp | 7 ++---- .../htmlparser/src/nsHTMLToTXTSinkStream.cpp | 7 ++---- mozilla/rdf/base/src/nsRDFService.cpp | 6 +---- mozilla/rdf/content/src/nsXULSortService.cpp | 3 +-- mozilla/rdf/datasource/src/nsLocalStore.cpp | 5 +--- mozilla/widget/src/xlib/nsAppShell.cpp | 24 +++++++------------ mozilla/xpcom/base/nsConsoleService.cpp | 2 +- .../xpfe/appshell/src/nsWebShellWindow.cpp | 3 +-- 26 files changed, 51 insertions(+), 124 deletions(-) diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index c3d89583d65..5e32e2ba38f 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -3526,11 +3526,7 @@ nsDocument::GetDTD(nsIDTD** aDTD) const rv = doctype->GetName(doctypename); if (NS_FAILED(rv)) return rv; - nsCOMPtr parser; - rv = nsComponentManager::CreateInstance(kCParserCID, - nsnull, - kCParserIID, - (void **)&parser); + nsCOMPtr parser( do_CreateInstance(kCParserCID, &rv) ); if (NS_FAILED(rv)) return rv; if (!parser) return NS_ERROR_FAILURE; diff --git a/mozilla/content/xsl/document/src/nsTransformMediator.cpp b/mozilla/content/xsl/document/src/nsTransformMediator.cpp index 00ce91c81a0..148cd1b444f 100644 --- a/mozilla/content/xsl/document/src/nsTransformMediator.cpp +++ b/mozilla/content/xsl/document/src/nsTransformMediator.cpp @@ -79,8 +79,7 @@ nsTransformMediator::Init(const nsString& aMimeType) rv = nsComponentManager::ContractIDToClassID((const char*)contractIDStr, &cid); if (NS_SUCCEEDED(rv)) { // Try to find a component that implements the nsIDocumentTransformer interface - rv = nsComponentManager::CreateInstance(cid, nsnull, - NS_GET_IID(nsIDocumentTransformer), (void**) &mTransformer); + mTransformer = do_CreateInstance(cid, &rv); } delete [] contractIDStr; } diff --git a/mozilla/content/xul/templates/src/nsXULSortService.cpp b/mozilla/content/xul/templates/src/nsXULSortService.cpp index 67dd6f45fbe..af932fd85af 100644 --- a/mozilla/content/xul/templates/src/nsXULSortService.cpp +++ b/mozilla/content/xul/templates/src/nsXULSortService.cpp @@ -1000,8 +1000,7 @@ XULSortServiceImpl::GetCachedTarget(sortPtr sortInfo, PRBool useCache, nsIRDFRes if (!(sortInfo->mInner)) { // if we don't have a mInner, create one - rv = nsComponentManager::CreateInstance(kRDFInMemoryDataSourceCID, - nsnull, NS_GET_IID(nsIRDFDataSource), (void **)&(sortInfo->mInner)); + sortInfo->mInner = do_CreateInstance(kRDFInMemoryDataSourceCID, &rv); if (NS_FAILED(rv)) return(rv); } diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index e2f89b8ec89..82a2471fb10 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -1349,8 +1349,7 @@ nsWebShell::SelectAll(void) if (NS_FAILED(rv) || !doc) return rv; - nsCOMPtr htmldoc; - rv = doc->QueryInterface(NS_GET_IID(nsIDOMHTMLDocument), (void**)&htmldoc); + nsCOMPtr htmldoc( do_QueryInterface(doc) ); if (NS_FAILED(rv) || !htmldoc) return rv; nsCOMPtrbodyElement; diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp index 3d7b9f1baa0..f66ec8bf308 100644 --- a/mozilla/editor/base/nsEditorShell.cpp +++ b/mozilla/editor/base/nsEditorShell.cpp @@ -2002,7 +2002,6 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi return NS_ERROR_NOT_INITIALIZED; - nsCOMPtr fileWidget; nsAutoString HTMLTitle; GetBundleString(NS_LITERAL_STRING("OpenHTMLFile"), HTMLTitle); @@ -2023,10 +2022,8 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi // TODO: GET THE DEFAULT DIRECTORY FOR DIFFERENT TYPES FROM PREFERENCES nsFileSpec aDisplayDirectory; - nsresult res = nsComponentManager::CreateInstance(kCFileWidgetCID, - nsnull, - NS_GET_IID(nsIFileWidget), - (void**)&fileWidget); + nsresult res; + nsCOMPtr fileWidget( do_CreateInstance(kCFileWidgetCID,&res) ); if (NS_SUCCEEDED(res)) { nsFileDlgResults dialogResult; diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp index 3d7b9f1baa0..f66ec8bf308 100644 --- a/mozilla/editor/composer/src/nsEditorShell.cpp +++ b/mozilla/editor/composer/src/nsEditorShell.cpp @@ -2002,7 +2002,6 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi return NS_ERROR_NOT_INITIALIZED; - nsCOMPtr fileWidget; nsAutoString HTMLTitle; GetBundleString(NS_LITERAL_STRING("OpenHTMLFile"), HTMLTitle); @@ -2023,10 +2022,8 @@ nsEditorShell::GetLocalFileURL(nsIDOMWindowInternal *parent, const PRUnichar *fi // TODO: GET THE DEFAULT DIRECTORY FOR DIFFERENT TYPES FROM PREFERENCES nsFileSpec aDisplayDirectory; - nsresult res = nsComponentManager::CreateInstance(kCFileWidgetCID, - nsnull, - NS_GET_IID(nsIFileWidget), - (void**)&fileWidget); + nsresult res; + nsCOMPtr fileWidget( do_CreateInstance(kCFileWidgetCID,&res) ); if (NS_SUCCEEDED(res)) { nsFileDlgResults dialogResult; diff --git a/mozilla/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/htmlparser/src/nsExpatTokenizer.cpp index 45341e3aa98..b5d32e0c713 100644 --- a/mozilla/htmlparser/src/nsExpatTokenizer.cpp +++ b/mozilla/htmlparser/src/nsExpatTokenizer.cpp @@ -681,7 +681,7 @@ void nsExpatTokenizer::HandleUnparsedEntityDecl(void *userData, // relative to the current process directory). For the latter case, aDTD is set // to the file: url that points to the DTD file found in the local DTD directory. static PRBool -IsLoadableDTD(nsIURI** aDTD) +IsLoadableDTD(nsCOMPtr* aDTD) { char* scheme = nsnull; PRBool isLoadable = PR_FALSE; @@ -720,9 +720,7 @@ IsLoadableDTD(nsIURI** aDTD) nsCOMPtr dtdURI; res = NS_NewURI(getter_AddRefs(dtdURI), dtdFile.GetURLString()); if (NS_SUCCEEDED(res) && nsnull != dtdURI) { - NS_IF_RELEASE(*aDTD); *aDTD = dtdURI; - NS_ADDREF(*aDTD); isLoadable = PR_TRUE; } } @@ -744,10 +742,10 @@ nsExpatTokenizer::OpenInputStream(const nsString& aURLStr, nsCOMPtr baseURI; rv = NS_NewURI(getter_AddRefs(baseURI), aBaseURL); if (NS_SUCCEEDED(rv) && nsnull != baseURI) { - nsCOMPtr uri = nsnull; + nsCOMPtr uri; rv = NS_NewURI(getter_AddRefs(uri), aURLStr, baseURI); - if (NS_SUCCEEDED(rv) && nsnull != uri) { - if (IsLoadableDTD((nsIURI**) &uri)) { + if (NS_SUCCEEDED(rv) && uri) { + if (IsLoadableDTD(address_of(uri))) { rv = NS_OpenURI(in, uri); char* absURL = nsnull; uri->GetSpec(&absURL); diff --git a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp index 209b11fd8b8..04fcede6a29 100644 --- a/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -1103,11 +1103,8 @@ PRBool nsHTMLContentSinkStream::IsBlockLevel(eHTMLTags aTag) { if (!mDTD) { - nsCOMPtr parser; - nsresult rv = nsComponentManager::CreateInstance(kCParserCID, - nsnull, - kCParserIID, - (void **)&parser); + nsresult rv; + nsCOMPtr parser( do_CreateInstance(kCParserCID, &rv) ); if (NS_FAILED(rv)) return rv; if (!parser) return NS_ERROR_FAILURE; diff --git a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp index 3ad9072040e..41768f72ded 100644 --- a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp +++ b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.cpp @@ -1611,11 +1611,8 @@ PRBool nsHTMLToTXTSinkStream::IsBlockLevel(eHTMLTags aTag) { if (!mDTD) { - nsCOMPtr parser; - nsresult rv = nsComponentManager::CreateInstance(kCParserCID, - nsnull, - kCParserIID, - (void **)&parser); + nsresult rv; + nsCOMPtr parser( do_CreateInstance(kCParserCID, &rv) ); if (NS_FAILED(rv)) return rv; if (!parser) return NS_ERROR_FAILURE; diff --git a/mozilla/layout/base/src/nsDocument.cpp b/mozilla/layout/base/src/nsDocument.cpp index c3d89583d65..5e32e2ba38f 100644 --- a/mozilla/layout/base/src/nsDocument.cpp +++ b/mozilla/layout/base/src/nsDocument.cpp @@ -3526,11 +3526,7 @@ nsDocument::GetDTD(nsIDTD** aDTD) const rv = doctype->GetName(doctypename); if (NS_FAILED(rv)) return rv; - nsCOMPtr parser; - rv = nsComponentManager::CreateInstance(kCParserCID, - nsnull, - kCParserIID, - (void **)&parser); + nsCOMPtr parser( do_CreateInstance(kCParserCID, &rv) ); if (NS_FAILED(rv)) return rv; if (!parser) return NS_ERROR_FAILURE; diff --git a/mozilla/layout/generic/nsFrame.cpp b/mozilla/layout/generic/nsFrame.cpp index 73f5bbd7311..a6f0546dcd7 100644 --- a/mozilla/layout/generic/nsFrame.cpp +++ b/mozilla/layout/generic/nsFrame.cpp @@ -1237,11 +1237,7 @@ nsFrame::HandleMultiplePress(nsIPresContext* aPresContext, selectPara = PR_TRUE; else if (me->clickCount == 3) { - nsCOMPtr prefsService; - rv = nsServiceManager::GetService(kPrefCID, - NS_GET_IID(nsIPref), - (nsISupports**)&prefsService); - + nsCOMPtr prefsService( do_GetService(kPrefCID, &rv) ); if (NS_SUCCEEDED(rv) && prefsService) prefsService->GetBoolPref("browser.triple_click_selects_paragraph", &selectPara); } diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 99d63180faa..100da17934f 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -1973,11 +1973,8 @@ nsTextFrame::GetPositionSlowly(nsIPresContext* aPresContext, ComputeExtraJustificationSpacing(*aRendContext, ts, paintBuffer.mBuffer, textLength, numSpaces); //IF STYLE SAYS TO SELECT TO END OF FRAME HERE... - nsCOMPtr prefs; + nsCOMPtr prefs( do_GetService(kPrefCID, &rv) ); PRInt32 prefInt = 0; - rv = nsServiceManager::GetService(kPrefCID, - NS_GET_IID(nsIPref), - (nsISupports**)&prefs); PRBool outofstylehandled = PR_FALSE; if (NS_SUCCEEDED(rv) && prefs) { @@ -2767,11 +2764,8 @@ nsTextFrame::GetPosition(nsIPresContext* aCX, GetOffsetFromView(aCX, origin, &view); //IF STYLE SAYS TO SELECT TO END OF FRAME HERE... - nsCOMPtr prefs; + nsCOMPtr prefs( do_GetService(kPrefCID, &rv) ); PRInt32 prefInt = 0; - rv = nsServiceManager::GetService(kPrefCID, - NS_GET_IID(nsIPref), - (nsISupports**)&prefs); PRBool outofstylehandled = PR_FALSE; if (NS_SUCCEEDED(rv) && prefs) { diff --git a/mozilla/layout/html/base/src/nsFrame.cpp b/mozilla/layout/html/base/src/nsFrame.cpp index 73f5bbd7311..a6f0546dcd7 100644 --- a/mozilla/layout/html/base/src/nsFrame.cpp +++ b/mozilla/layout/html/base/src/nsFrame.cpp @@ -1237,11 +1237,7 @@ nsFrame::HandleMultiplePress(nsIPresContext* aPresContext, selectPara = PR_TRUE; else if (me->clickCount == 3) { - nsCOMPtr prefsService; - rv = nsServiceManager::GetService(kPrefCID, - NS_GET_IID(nsIPref), - (nsISupports**)&prefsService); - + nsCOMPtr prefsService( do_GetService(kPrefCID, &rv) ); if (NS_SUCCEEDED(rv) && prefsService) prefsService->GetBoolPref("browser.triple_click_selects_paragraph", &selectPara); } diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 99d63180faa..100da17934f 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -1973,11 +1973,8 @@ nsTextFrame::GetPositionSlowly(nsIPresContext* aPresContext, ComputeExtraJustificationSpacing(*aRendContext, ts, paintBuffer.mBuffer, textLength, numSpaces); //IF STYLE SAYS TO SELECT TO END OF FRAME HERE... - nsCOMPtr prefs; + nsCOMPtr prefs( do_GetService(kPrefCID, &rv) ); PRInt32 prefInt = 0; - rv = nsServiceManager::GetService(kPrefCID, - NS_GET_IID(nsIPref), - (nsISupports**)&prefs); PRBool outofstylehandled = PR_FALSE; if (NS_SUCCEEDED(rv) && prefs) { @@ -2767,11 +2764,8 @@ nsTextFrame::GetPosition(nsIPresContext* aCX, GetOffsetFromView(aCX, origin, &view); //IF STYLE SAYS TO SELECT TO END OF FRAME HERE... - nsCOMPtr prefs; + nsCOMPtr prefs( do_GetService(kPrefCID, &rv) ); PRInt32 prefInt = 0; - rv = nsServiceManager::GetService(kPrefCID, - NS_GET_IID(nsIPref), - (nsISupports**)&prefs); PRBool outofstylehandled = PR_FALSE; if (NS_SUCCEEDED(rv) && prefs) { diff --git a/mozilla/layout/xsl/document/src/nsTransformMediator.cpp b/mozilla/layout/xsl/document/src/nsTransformMediator.cpp index 00ce91c81a0..148cd1b444f 100644 --- a/mozilla/layout/xsl/document/src/nsTransformMediator.cpp +++ b/mozilla/layout/xsl/document/src/nsTransformMediator.cpp @@ -79,8 +79,7 @@ nsTransformMediator::Init(const nsString& aMimeType) rv = nsComponentManager::ContractIDToClassID((const char*)contractIDStr, &cid); if (NS_SUCCEEDED(rv)) { // Try to find a component that implements the nsIDocumentTransformer interface - rv = nsComponentManager::CreateInstance(cid, nsnull, - NS_GET_IID(nsIDocumentTransformer), (void**) &mTransformer); + mTransformer = do_CreateInstance(cid, &rv); } delete [] contractIDStr; } diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp index d9d6a98bc20..aa99b90b23f 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp @@ -1551,13 +1551,12 @@ nsMsgLocalMailFolder::GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgD return NS_ERROR_NULL_POINTER; //ducarroz: should we use NS_ERROR_INVALID_ARG? - nsCOMPtr mailDBFactory; + nsresult rv; + nsCOMPtr mailDBFactory( do_CreateInstance(kCMailDB, &rv) ); nsCOMPtr mailDB; - - nsresult rv = nsComponentManager::CreateInstance(kCMailDB, nsnull, NS_GET_IID(nsIMsgDatabase), getter_AddRefs(mailDBFactory)); if (NS_SUCCEEDED(rv) && mailDBFactory) { - openErr = mailDBFactory->Open(mPath, PR_FALSE, PR_FALSE, (nsIMsgDatabase **) &mailDB); + openErr = mailDBFactory->Open(mPath, PR_FALSE, PR_FALSE, getter_AddRefs(mailDB)); } *db = mailDB; diff --git a/mozilla/mailnews/news/src/nsNewsFolder.cpp b/mozilla/mailnews/news/src/nsNewsFolder.cpp index 440053db543..cf01a52bd94 100644 --- a/mozilla/mailnews/news/src/nsNewsFolder.cpp +++ b/mozilla/mailnews/news/src/nsNewsFolder.cpp @@ -730,12 +730,11 @@ nsMsgNewsFolder::GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDataba if(!db || !folderInfo) return NS_ERROR_NULL_POINTER; //ducarroz: should we use NS_ERROR_INVALID_ARG? - nsCOMPtr newsDBFactory; + nsresult rv; + nsCOMPtr newsDBFactory( do_CreateInstance(kCNewsDB, &rv) ); nsCOMPtr newsDB; - - nsresult rv = nsComponentManager::CreateInstance(kCNewsDB, nsnull, NS_GET_IID(nsIMsgDatabase), getter_AddRefs(newsDBFactory)); if (NS_SUCCEEDED(rv) && newsDBFactory) { - openErr = newsDBFactory->Open(mPath, PR_FALSE, PR_FALSE, (nsIMsgDatabase **) &newsDB); + openErr = newsDBFactory->Open(mPath, PR_FALSE, PR_FALSE, getter_AddRefs(newsDB)); } else { return rv; diff --git a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp index 45341e3aa98..b5d32e0c713 100644 --- a/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp +++ b/mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp @@ -681,7 +681,7 @@ void nsExpatTokenizer::HandleUnparsedEntityDecl(void *userData, // relative to the current process directory). For the latter case, aDTD is set // to the file: url that points to the DTD file found in the local DTD directory. static PRBool -IsLoadableDTD(nsIURI** aDTD) +IsLoadableDTD(nsCOMPtr* aDTD) { char* scheme = nsnull; PRBool isLoadable = PR_FALSE; @@ -720,9 +720,7 @@ IsLoadableDTD(nsIURI** aDTD) nsCOMPtr dtdURI; res = NS_NewURI(getter_AddRefs(dtdURI), dtdFile.GetURLString()); if (NS_SUCCEEDED(res) && nsnull != dtdURI) { - NS_IF_RELEASE(*aDTD); *aDTD = dtdURI; - NS_ADDREF(*aDTD); isLoadable = PR_TRUE; } } @@ -744,10 +742,10 @@ nsExpatTokenizer::OpenInputStream(const nsString& aURLStr, nsCOMPtr baseURI; rv = NS_NewURI(getter_AddRefs(baseURI), aBaseURL); if (NS_SUCCEEDED(rv) && nsnull != baseURI) { - nsCOMPtr uri = nsnull; + nsCOMPtr uri; rv = NS_NewURI(getter_AddRefs(uri), aURLStr, baseURI); - if (NS_SUCCEEDED(rv) && nsnull != uri) { - if (IsLoadableDTD((nsIURI**) &uri)) { + if (NS_SUCCEEDED(rv) && uri) { + if (IsLoadableDTD(address_of(uri))) { rv = NS_OpenURI(in, uri); char* absURL = nsnull; uri->GetSpec(&absURL); diff --git a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp index 209b11fd8b8..04fcede6a29 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLContentSinkStream.cpp @@ -1103,11 +1103,8 @@ PRBool nsHTMLContentSinkStream::IsBlockLevel(eHTMLTags aTag) { if (!mDTD) { - nsCOMPtr parser; - nsresult rv = nsComponentManager::CreateInstance(kCParserCID, - nsnull, - kCParserIID, - (void **)&parser); + nsresult rv; + nsCOMPtr parser( do_CreateInstance(kCParserCID, &rv) ); if (NS_FAILED(rv)) return rv; if (!parser) return NS_ERROR_FAILURE; diff --git a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp index 3ad9072040e..41768f72ded 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp +++ b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp @@ -1611,11 +1611,8 @@ PRBool nsHTMLToTXTSinkStream::IsBlockLevel(eHTMLTags aTag) { if (!mDTD) { - nsCOMPtr parser; - nsresult rv = nsComponentManager::CreateInstance(kCParserCID, - nsnull, - kCParserIID, - (void **)&parser); + nsresult rv; + nsCOMPtr parser( do_CreateInstance(kCParserCID, &rv) ); if (NS_FAILED(rv)) return rv; if (!parser) return NS_ERROR_FAILURE; diff --git a/mozilla/rdf/base/src/nsRDFService.cpp b/mozilla/rdf/base/src/nsRDFService.cpp index bbd10f47d8a..c6aeaae7aad 100644 --- a/mozilla/rdf/base/src/nsRDFService.cpp +++ b/mozilla/rdf/base/src/nsRDFService.cpp @@ -1185,11 +1185,7 @@ RDFServiceImpl::GetDataSource(const char* aURI, nsIRDFDataSource** aDataSource) } else { // Try to load this as an RDF/XML data source - rv = nsComponentManager::CreateInstance(kRDFXMLDataSourceCID, - nsnull, - NS_GET_IID(nsIRDFDataSource), - (void**) &ds); - + ds = do_CreateInstance(kRDFXMLDataSourceCID, &rv); if (NS_FAILED(rv)) return rv; // Start the datasource load asynchronously. If you wanted it diff --git a/mozilla/rdf/content/src/nsXULSortService.cpp b/mozilla/rdf/content/src/nsXULSortService.cpp index 67dd6f45fbe..af932fd85af 100644 --- a/mozilla/rdf/content/src/nsXULSortService.cpp +++ b/mozilla/rdf/content/src/nsXULSortService.cpp @@ -1000,8 +1000,7 @@ XULSortServiceImpl::GetCachedTarget(sortPtr sortInfo, PRBool useCache, nsIRDFRes if (!(sortInfo->mInner)) { // if we don't have a mInner, create one - rv = nsComponentManager::CreateInstance(kRDFInMemoryDataSourceCID, - nsnull, NS_GET_IID(nsIRDFDataSource), (void **)&(sortInfo->mInner)); + sortInfo->mInner = do_CreateInstance(kRDFInMemoryDataSourceCID, &rv); if (NS_FAILED(rv)) return(rv); } diff --git a/mozilla/rdf/datasource/src/nsLocalStore.cpp b/mozilla/rdf/datasource/src/nsLocalStore.cpp index b317c596786..b80192073a0 100644 --- a/mozilla/rdf/datasource/src/nsLocalStore.cpp +++ b/mozilla/rdf/datasource/src/nsLocalStore.cpp @@ -379,10 +379,7 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); return NS_ERROR_UNEXPECTED; } - rv = nsComponentManager::CreateInstance(kRDFXMLDataSourceCID, - nsnull, - NS_GET_IID(nsIRDFDataSource), - (void**) &mInner); + mInner = do_CreateInstance(kRDFXMLDataSourceCID, &rv); if (NS_FAILED(rv)) return rv; nsCOMPtr remote = do_QueryInterface(mInner); diff --git a/mozilla/widget/src/xlib/nsAppShell.cpp b/mozilla/widget/src/xlib/nsAppShell.cpp index 75e1e4da301..ccb582f8734 100644 --- a/mozilla/widget/src/xlib/nsAppShell.cpp +++ b/mozilla/widget/src/xlib/nsAppShell.cpp @@ -1241,11 +1241,9 @@ void nsAppShell::HandleDragMotionEvent(XEvent *event, nsWidget *aWidget) { nsMouseEvent mevent; PRBool currentlyDragging = PR_FALSE; - nsCOMPtr dragService; + nsresult rv; + nsCOMPtr dragService( do_GetService(kCDragServiceCID, &rv) ); nsCOMPtr dragServiceXlib; - nsresult rv = nsServiceManager::GetService(kCDragServiceCID, - nsIDragService::GetIID(), - (nsISupports**)&dragService); if (NS_SUCCEEDED(rv)) { dragServiceXlib = do_QueryInterface(dragService); if (dragServiceXlib) { @@ -1272,10 +1270,8 @@ void nsAppShell::HandleDragEnterEvent(XEvent *event, nsWidget *aWidget) { nsMouseEvent enterEvent; PRBool currentlyDragging = PR_FALSE; - nsCOMPtr dragService; - nsresult rv = nsServiceManager::GetService(kCDragServiceCID, - nsIDragService::GetIID(), - (nsISupports**)&dragService); + nsresult rv; + nsCOMPtr dragService( do_GetService(kCDragServiceCID, &rv) ); if (NS_SUCCEEDED(rv)) { nsCOMPtr dragServiceXlib; dragServiceXlib = do_QueryInterface(dragService); @@ -1303,10 +1299,8 @@ void nsAppShell::HandleDragLeaveEvent(XEvent *event, nsWidget *aWidget) { nsMouseEvent leaveEvent; PRBool currentlyDragging = PR_FALSE; - nsCOMPtr dragService; - nsresult rv = nsServiceManager::GetService(kCDragServiceCID, - nsIDragService::GetIID(), - (nsISupports**)&dragService); + nsresult rv; + nsCOMPtr dragService( do_GetService(kCDragServiceCID, &rv) ); // FIXME: Not sure if currentlyDragging is required. KenF if (NS_SUCCEEDED(rv)) { @@ -1336,10 +1330,8 @@ void nsAppShell::HandleDragDropEvent(XEvent *event, nsWidget *aWidget) { nsMouseEvent mevent; PRBool currentlyDragging = PR_FALSE; - nsCOMPtr dragService; - nsresult rv = nsServiceManager::GetService(kCDragServiceCID, - nsIDragService::GetIID(), - (nsISupports**)&dragService); + nsresult rv; + nsCOMPtr dragService( do_GetService(kCDragServiceCID, &rv) ); // FIXME: Dont think the currentlyDragging check is required. KenF if (NS_SUCCEEDED(rv)) { diff --git a/mozilla/xpcom/base/nsConsoleService.cpp b/mozilla/xpcom/base/nsConsoleService.cpp index 7cfc328e0e1..2dbae67ea8d 100644 --- a/mozilla/xpcom/base/nsConsoleService.cpp +++ b/mozilla/xpcom/base/nsConsoleService.cpp @@ -48,7 +48,7 @@ nsConsoleService::nsConsoleService() // XXX deal with below three by detecting null mLock in factory? nsresult rv; rv = nsSupportsArray::Create(NULL, NS_GET_IID(nsISupportsArray), - (void**)&mListeners); + (void**)getter_AddRefs(mListeners)); mMessages = (nsIConsoleMessage **) nsMemory::Alloc(mBufferSize * sizeof(nsIConsoleMessage *)); diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index 285f8e09cfc..5c958e1c7fb 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -258,8 +258,7 @@ nsresult nsWebShellWindow::Initialize(nsIXULWindow* aParent, nsRect r(0, 0, aInitialWidth, aInitialHeight); // Create top level window - rv = nsComponentManager::CreateInstance(kWindowCID, nsnull, NS_GET_IID(nsIWidget), - (void**)&mWindow); + mWindow = do_CreateInstance(kWindowCID, &rv); if (NS_OK != rv) { return rv; }