From fdfd8886080e6774fec55ce58379c0a764ed8a45 Mon Sep 17 00:00:00 2001 From: "pp%ludusdesign.com" Date: Tue, 1 Feb 2000 14:26:27 +0000 Subject: [PATCH] Conversion to NS_GET_IID(). Bug #20232, r=scc@netscape.com git-svn-id: svn://10.0.0.236/trunk@59394 18797224-902f-48f8-a5cc-f745e15eee43 --- .../xul/content/src/nsXULTreeElement.cpp | 4 +- mozilla/editor/base/nsHTMLEditor.cpp | 75 ++++++++++--------- .../editor/libeditor/html/nsHTMLEditor.cpp | 75 ++++++++++--------- mozilla/extensions/cookie/nsCookie.cpp | 3 +- .../xmlterm/base/mozXMLTerminal.cpp | 2 +- mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp | 2 +- mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp | 3 +- mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp | 2 +- .../htmlparser/src/nsHTMLToTXTSinkStream.h | 9 ++- .../modules/oji/src/nsCJVMManagerFactory.cpp | 5 +- .../protocol/http/src/nsHTTPHandler.cpp | 2 +- .../htmlparser/src/nsHTMLToTXTSinkStream.h | 9 ++- mozilla/rdf/content/src/nsXULKeyListener.cpp | 11 +-- mozilla/rdf/content/src/nsXULTreeElement.cpp | 4 +- mozilla/webshell/src/nsDocLoader.cpp | 5 +- mozilla/xpcom/tests/nsIFileTest.cpp | 4 +- mozilla/xpcom/tools/registry/regxpcom.cpp | 3 +- .../xpfe/appshell/src/nsAppShellService.cpp | 9 ++- mozilla/xpfe/appshell/src/nsCommonDialogs.cpp | 3 +- .../xpfe/browser/src/nsBrowserInstance.cpp | 6 +- .../components/shistory/src/nsSHEntry.cpp | 7 +- .../components/shistory/src/nsSHistory.cpp | 3 +- mozilla/xpinstall/notifier/nsXPIFlash.cpp | 17 +++-- 23 files changed, 139 insertions(+), 124 deletions(-) diff --git a/mozilla/content/xul/content/src/nsXULTreeElement.cpp b/mozilla/content/xul/content/src/nsXULTreeElement.cpp index 740702d471c..2b2daf60f1b 100644 --- a/mozilla/content/xul/content/src/nsXULTreeElement.cpp +++ b/mozilla/content/xul/content/src/nsXULTreeElement.cpp @@ -397,7 +397,7 @@ nsXULTreeElement::SelectItemRange(nsIDOMXULElement* aStartItem, nsIDOMXULElement nsCOMPtr range; nsresult result; result = nsComponentManager::CreateInstance(kCRangeCID, nsnull, - nsIDOMRange::GetIID(), getter_AddRefs(range)); + NS_GET_IID(nsIDOMRange), getter_AddRefs(range)); PRInt32 startIndex = 0; PRInt32 endIndex = 0; @@ -431,7 +431,7 @@ nsXULTreeElement::SelectItemRange(nsIDOMXULElement* aStartItem, nsIDOMXULElement // Create the iterator nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; diff --git a/mozilla/editor/base/nsHTMLEditor.cpp b/mozilla/editor/base/nsHTMLEditor.cpp index 1d646e56547..b8d8e1fcaf1 100644 --- a/mozilla/editor/base/nsHTMLEditor.cpp +++ b/mozilla/editor/base/nsHTMLEditor.cpp @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ #include "nsICaret.h" @@ -299,22 +300,22 @@ nsHTMLEditor::~nsHTMLEditor() if (NS_SUCCEEDED(result) && erP) { if (mKeyListenerP) { - erP->RemoveEventListenerByIID(mKeyListenerP, nsIDOMKeyListener::GetIID()); + erP->RemoveEventListenerByIID(mKeyListenerP, NS_GET_IID(nsIDOMKeyListener)); } if (mMouseListenerP) { - erP->RemoveEventListenerByIID(mMouseListenerP, nsIDOMMouseListener::GetIID()); + erP->RemoveEventListenerByIID(mMouseListenerP, NS_GET_IID(nsIDOMMouseListener)); } if (mTextListenerP) { - erP->RemoveEventListenerByIID(mTextListenerP, nsIDOMTextListener::GetIID()); + erP->RemoveEventListenerByIID(mTextListenerP, NS_GET_IID(nsIDOMTextListener)); } if (mCompositionListenerP) { - erP->RemoveEventListenerByIID(mCompositionListenerP, nsIDOMCompositionListener::GetIID()); + erP->RemoveEventListenerByIID(mCompositionListenerP, NS_GET_IID(nsIDOMCompositionListener)); } if (mFocusListenerP) { - erP->RemoveEventListenerByIID(mFocusListenerP, nsIDOMFocusListener::GetIID()); + erP->RemoveEventListenerByIID(mFocusListenerP, NS_GET_IID(nsIDOMFocusListener)); } if (mDragListenerP) { - erP->RemoveEventListenerByIID(mDragListenerP, nsIDOMDragListener::GetIID()); + erP->RemoveEventListenerByIID(mDragListenerP, NS_GET_IID(nsIDOMDragListener)); } } else @@ -339,27 +340,27 @@ NS_IMETHODIMP nsHTMLEditor::QueryInterface(REFNSIID aIID, void** aInstancePtr) *aInstancePtr = nsnull; - if (aIID.Equals(nsIHTMLEditor::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsIHTMLEditor))) { *aInstancePtr = NS_STATIC_CAST(nsIHTMLEditor*, this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(nsIEditorMailSupport::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsIEditorMailSupport))) { *aInstancePtr = NS_STATIC_CAST(nsIEditorMailSupport*, this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(nsITableEditor::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsITableEditor))) { *aInstancePtr = NS_STATIC_CAST(nsITableEditor*, this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(nsIEditorStyleSheets::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsIEditorStyleSheets))) { *aInstancePtr = NS_STATIC_CAST(nsIEditorStyleSheets*, this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(nsICSSLoaderObserver::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsICSSLoaderObserver))) { *aInstancePtr = NS_STATIC_CAST(nsICSSLoaderObserver*, this); NS_ADDREF_THIS(); return NS_OK; @@ -407,7 +408,7 @@ NS_IMETHODIMP nsHTMLEditor::Init(nsIDOMDocument *aDoc, // HACK: This should have happened in a document specific way // in nsEditor::Init(), but we dont' have a way to do that yet result = nsComponentManager::CreateInstance(kCNavDTDCID, nsnull, - nsIDTD::GetIID(), getter_AddRefs(mDTD)); + NS_GET_IID(nsIDTD), getter_AddRefs(mDTD)); if (!mDTD) result = NS_ERROR_FAILURE; // Init the rules system @@ -577,34 +578,34 @@ printf("nsTextEditor.cpp: failed to get TextEvent Listener\n"); nsCOMPtr erP; nsCOMPtr doc = do_QueryReferent(mDocWeak); if (!doc) return NS_ERROR_NOT_INITIALIZED; - result = doc->QueryInterface(nsIDOMEventReceiver::GetIID(), getter_AddRefs(erP)); + result = doc->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP)); if (NS_FAILED(result)) { HandleEventListenerError(); return result; } // register the event listeners with the DOM event reveiver - result = erP->AddEventListenerByIID(mKeyListenerP, nsIDOMKeyListener::GetIID()); + result = erP->AddEventListenerByIID(mKeyListenerP, NS_GET_IID(nsIDOMKeyListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register key listener"); if (NS_SUCCEEDED(result)) { - result = erP->AddEventListenerByIID(mMouseListenerP, nsIDOMMouseListener::GetIID()); + result = erP->AddEventListenerByIID(mMouseListenerP, NS_GET_IID(nsIDOMMouseListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register mouse listener"); if (NS_SUCCEEDED(result)) { - result = erP->AddEventListenerByIID(mFocusListenerP, nsIDOMFocusListener::GetIID()); + result = erP->AddEventListenerByIID(mFocusListenerP, NS_GET_IID(nsIDOMFocusListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register focus listener"); if (NS_SUCCEEDED(result)) { - result = erP->AddEventListenerByIID(mTextListenerP, nsIDOMTextListener::GetIID()); + result = erP->AddEventListenerByIID(mTextListenerP, NS_GET_IID(nsIDOMTextListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register text listener"); if (NS_SUCCEEDED(result)) { - result = erP->AddEventListenerByIID(mCompositionListenerP, nsIDOMCompositionListener::GetIID()); + result = erP->AddEventListenerByIID(mCompositionListenerP, NS_GET_IID(nsIDOMCompositionListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register composition listener"); if (NS_SUCCEEDED(result)) { - result = erP->AddEventListenerByIID(mDragListenerP, nsIDOMDragListener::GetIID()); + result = erP->AddEventListenerByIID(mDragListenerP, NS_GET_IID(nsIDOMDragListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register drag listener"); } } @@ -777,7 +778,7 @@ NS_IMETHODIMP nsHTMLEditor::TabInTable(PRBool inIsShift, PRBool *outHandled) // first create an iterator over the table nsCOMPtr iter; res = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(res)) return res; if (!iter) return NS_ERROR_NULL_POINTER; @@ -1113,7 +1114,7 @@ NS_IMETHODIMP nsHTMLEditor::GetInlineProperty(nsIAtom *aProperty, // either non-collapsed selection or no cached value: do it the hard way nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; @@ -2734,7 +2735,7 @@ nsHTMLEditor::GetSelectedElement(const nsString& aTagName, nsIDOMElement** aRetu nsCOMPtr range( do_QueryInterface(currentItem) ); nsCOMPtr iter; res = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); // XXX: ERROR_HANDLING XPCOM usage if ((NS_SUCCEEDED(res)) && iter) @@ -3428,7 +3429,7 @@ nsHTMLEditor::GetEmbeddedObjects(nsISupportsArray** aNodeList) nsCOMPtr iter; res = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (!iter) return NS_ERROR_NULL_POINTER; if ((NS_SUCCEEDED(res))) @@ -3737,7 +3738,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste() // Create generic Transferable for getting the data nsCOMPtr trans; rv = nsComponentManager::CreateInstance(kCTransferableCID, nsnull, - nsITransferable::GetIID(), + NS_GET_IID(nsITransferable), (void**) getter_AddRefs(trans)); if (NS_SUCCEEDED(rv)) { @@ -3951,7 +3952,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation() // Create generic Transferable for getting the data nsCOMPtr trans; rv = nsComponentManager::CreateInstance(kCTransferableCID, nsnull, - nsITransferable::GetIID(), + NS_GET_IID(nsITransferable), (void**) getter_AddRefs(trans)); if (NS_SUCCEEDED(rv) && trans) { @@ -4222,7 +4223,7 @@ NS_IMETHODIMP nsHTMLEditor::OutputToString(nsString& aOutputString, nsCRT::free(type); rv = nsComponentManager::CreateInstance(progid, nsnull, - nsIDocumentEncoder::GetIID(), + NS_GET_IID(nsIDocumentEncoder), getter_AddRefs(encoder)); nsCRT::free(progid); @@ -4305,7 +4306,7 @@ NS_IMETHODIMP nsHTMLEditor::OutputToStream(nsIOutputStream* aOutputStream, nsCRT::free(type); rv = nsComponentManager::CreateInstance(progid, nsnull, - nsIDocumentEncoder::GetIID(), + NS_GET_IID(nsIDocumentEncoder), getter_AddRefs(encoder)); nsCRT::free(progid); @@ -4801,7 +4802,7 @@ nsresult nsHTMLEditor::GetAbsoluteOffsetsForPoints(nsIDOMNode *aInStartNode, nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; @@ -4888,7 +4889,7 @@ nsHTMLEditor::GetTextSelectionOffsetsForRange(nsIDOMSelection *aSelection, nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; @@ -4937,7 +4938,7 @@ void nsHTMLEditor::ResetTextSelectionForRange(nsIDOMNode *aParent, nsresult result; nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return; if (!iter) return; @@ -5002,7 +5003,7 @@ nsHTMLEditor::ReParentContentOfNode(nsIDOMNode *aNode, // find the current block parent, or just use aNode if it is a block node nsCOMPtrblockParentElement; nsCOMPtrnodeToReParent; // this is the node we'll operate on, by default it's aNode - nsresult res = aNode->QueryInterface(nsIDOMNode::GetIID(), getter_AddRefs(nodeToReParent)); + nsresult res = aNode->QueryInterface(NS_GET_IID(nsIDOMNode), getter_AddRefs(nodeToReParent)); PRBool nodeIsInline; PRBool nodeIsBlock=PR_FALSE; IsNodeInline(aNode, nodeIsInline); @@ -5010,7 +5011,7 @@ nsHTMLEditor::ReParentContentOfNode(nsIDOMNode *aNode, { nsresult QIResult; nsCOMPtrnodeAsText; - QIResult = aNode->QueryInterface(nsIDOMCharacterData::GetIID(), getter_AddRefs(nodeAsText)); + QIResult = aNode->QueryInterface(NS_GET_IID(nsIDOMCharacterData), getter_AddRefs(nodeAsText)); if (NS_FAILED(QIResult) || !nodeAsText) { nodeIsBlock=PR_TRUE; } @@ -5018,7 +5019,7 @@ nsHTMLEditor::ReParentContentOfNode(nsIDOMNode *aNode, // if aNode is the block parent, then the node to reparent is one of its children if (PR_TRUE==nodeIsBlock) { - res = aNode->QueryInterface(nsIDOMNode::GetIID(), getter_AddRefs(blockParentElement)); + res = aNode->QueryInterface(NS_GET_IID(nsIDOMNode), getter_AddRefs(blockParentElement)); if (NS_SUCCEEDED(res) && blockParentElement) { res = aNode->GetFirstChild(getter_AddRefs(nodeToReParent)); } @@ -6450,7 +6451,7 @@ nsHTMLEditor::SetTextPropertiesForNodeWithDifferentParents(nsIDOMRange *aRange, // create new parent nodes for all the content between the start and end nodes nsCOMPtriter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), getter_AddRefs(iter)); + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; @@ -6994,7 +6995,7 @@ nsHTMLEditor::RemoveTextPropertiesForNodeWithDifferentParents(nsIDOMNode *aStar nsCOMPtr range; result = nsComponentManager::CreateInstance(kCRangeCID, nsnull, - nsIDOMRange::GetIID(), + NS_GET_IID(nsIDOMRange), getter_AddRefs(range)); if (NS_FAILED(result)) { return result; } if (!range) { return NS_ERROR_NULL_POINTER; } @@ -7017,7 +7018,7 @@ nsHTMLEditor::RemoveTextPropertiesForNodeWithDifferentParents(nsIDOMNode *aStar nsVoidArray nodeList; nsCOMPtriter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), getter_AddRefs(iter)); + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; @@ -7202,7 +7203,7 @@ nsHTMLEditor::CollapseAdjacentTextNodes(nsIDOMSelection *aInSelection) nsCOMPtr range( do_QueryInterface(currentItem) ); nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp index 1d646e56547..b8d8e1fcaf1 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ #include "nsICaret.h" @@ -299,22 +300,22 @@ nsHTMLEditor::~nsHTMLEditor() if (NS_SUCCEEDED(result) && erP) { if (mKeyListenerP) { - erP->RemoveEventListenerByIID(mKeyListenerP, nsIDOMKeyListener::GetIID()); + erP->RemoveEventListenerByIID(mKeyListenerP, NS_GET_IID(nsIDOMKeyListener)); } if (mMouseListenerP) { - erP->RemoveEventListenerByIID(mMouseListenerP, nsIDOMMouseListener::GetIID()); + erP->RemoveEventListenerByIID(mMouseListenerP, NS_GET_IID(nsIDOMMouseListener)); } if (mTextListenerP) { - erP->RemoveEventListenerByIID(mTextListenerP, nsIDOMTextListener::GetIID()); + erP->RemoveEventListenerByIID(mTextListenerP, NS_GET_IID(nsIDOMTextListener)); } if (mCompositionListenerP) { - erP->RemoveEventListenerByIID(mCompositionListenerP, nsIDOMCompositionListener::GetIID()); + erP->RemoveEventListenerByIID(mCompositionListenerP, NS_GET_IID(nsIDOMCompositionListener)); } if (mFocusListenerP) { - erP->RemoveEventListenerByIID(mFocusListenerP, nsIDOMFocusListener::GetIID()); + erP->RemoveEventListenerByIID(mFocusListenerP, NS_GET_IID(nsIDOMFocusListener)); } if (mDragListenerP) { - erP->RemoveEventListenerByIID(mDragListenerP, nsIDOMDragListener::GetIID()); + erP->RemoveEventListenerByIID(mDragListenerP, NS_GET_IID(nsIDOMDragListener)); } } else @@ -339,27 +340,27 @@ NS_IMETHODIMP nsHTMLEditor::QueryInterface(REFNSIID aIID, void** aInstancePtr) *aInstancePtr = nsnull; - if (aIID.Equals(nsIHTMLEditor::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsIHTMLEditor))) { *aInstancePtr = NS_STATIC_CAST(nsIHTMLEditor*, this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(nsIEditorMailSupport::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsIEditorMailSupport))) { *aInstancePtr = NS_STATIC_CAST(nsIEditorMailSupport*, this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(nsITableEditor::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsITableEditor))) { *aInstancePtr = NS_STATIC_CAST(nsITableEditor*, this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(nsIEditorStyleSheets::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsIEditorStyleSheets))) { *aInstancePtr = NS_STATIC_CAST(nsIEditorStyleSheets*, this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(nsICSSLoaderObserver::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsICSSLoaderObserver))) { *aInstancePtr = NS_STATIC_CAST(nsICSSLoaderObserver*, this); NS_ADDREF_THIS(); return NS_OK; @@ -407,7 +408,7 @@ NS_IMETHODIMP nsHTMLEditor::Init(nsIDOMDocument *aDoc, // HACK: This should have happened in a document specific way // in nsEditor::Init(), but we dont' have a way to do that yet result = nsComponentManager::CreateInstance(kCNavDTDCID, nsnull, - nsIDTD::GetIID(), getter_AddRefs(mDTD)); + NS_GET_IID(nsIDTD), getter_AddRefs(mDTD)); if (!mDTD) result = NS_ERROR_FAILURE; // Init the rules system @@ -577,34 +578,34 @@ printf("nsTextEditor.cpp: failed to get TextEvent Listener\n"); nsCOMPtr erP; nsCOMPtr doc = do_QueryReferent(mDocWeak); if (!doc) return NS_ERROR_NOT_INITIALIZED; - result = doc->QueryInterface(nsIDOMEventReceiver::GetIID(), getter_AddRefs(erP)); + result = doc->QueryInterface(NS_GET_IID(nsIDOMEventReceiver), getter_AddRefs(erP)); if (NS_FAILED(result)) { HandleEventListenerError(); return result; } // register the event listeners with the DOM event reveiver - result = erP->AddEventListenerByIID(mKeyListenerP, nsIDOMKeyListener::GetIID()); + result = erP->AddEventListenerByIID(mKeyListenerP, NS_GET_IID(nsIDOMKeyListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register key listener"); if (NS_SUCCEEDED(result)) { - result = erP->AddEventListenerByIID(mMouseListenerP, nsIDOMMouseListener::GetIID()); + result = erP->AddEventListenerByIID(mMouseListenerP, NS_GET_IID(nsIDOMMouseListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register mouse listener"); if (NS_SUCCEEDED(result)) { - result = erP->AddEventListenerByIID(mFocusListenerP, nsIDOMFocusListener::GetIID()); + result = erP->AddEventListenerByIID(mFocusListenerP, NS_GET_IID(nsIDOMFocusListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register focus listener"); if (NS_SUCCEEDED(result)) { - result = erP->AddEventListenerByIID(mTextListenerP, nsIDOMTextListener::GetIID()); + result = erP->AddEventListenerByIID(mTextListenerP, NS_GET_IID(nsIDOMTextListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register text listener"); if (NS_SUCCEEDED(result)) { - result = erP->AddEventListenerByIID(mCompositionListenerP, nsIDOMCompositionListener::GetIID()); + result = erP->AddEventListenerByIID(mCompositionListenerP, NS_GET_IID(nsIDOMCompositionListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register composition listener"); if (NS_SUCCEEDED(result)) { - result = erP->AddEventListenerByIID(mDragListenerP, nsIDOMDragListener::GetIID()); + result = erP->AddEventListenerByIID(mDragListenerP, NS_GET_IID(nsIDOMDragListener)); NS_ASSERTION(NS_SUCCEEDED(result), "failed to register drag listener"); } } @@ -777,7 +778,7 @@ NS_IMETHODIMP nsHTMLEditor::TabInTable(PRBool inIsShift, PRBool *outHandled) // first create an iterator over the table nsCOMPtr iter; res = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(res)) return res; if (!iter) return NS_ERROR_NULL_POINTER; @@ -1113,7 +1114,7 @@ NS_IMETHODIMP nsHTMLEditor::GetInlineProperty(nsIAtom *aProperty, // either non-collapsed selection or no cached value: do it the hard way nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; @@ -2734,7 +2735,7 @@ nsHTMLEditor::GetSelectedElement(const nsString& aTagName, nsIDOMElement** aRetu nsCOMPtr range( do_QueryInterface(currentItem) ); nsCOMPtr iter; res = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); // XXX: ERROR_HANDLING XPCOM usage if ((NS_SUCCEEDED(res)) && iter) @@ -3428,7 +3429,7 @@ nsHTMLEditor::GetEmbeddedObjects(nsISupportsArray** aNodeList) nsCOMPtr iter; res = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (!iter) return NS_ERROR_NULL_POINTER; if ((NS_SUCCEEDED(res))) @@ -3737,7 +3738,7 @@ NS_IMETHODIMP nsHTMLEditor::Paste() // Create generic Transferable for getting the data nsCOMPtr trans; rv = nsComponentManager::CreateInstance(kCTransferableCID, nsnull, - nsITransferable::GetIID(), + NS_GET_IID(nsITransferable), (void**) getter_AddRefs(trans)); if (NS_SUCCEEDED(rv)) { @@ -3951,7 +3952,7 @@ NS_IMETHODIMP nsHTMLEditor::PasteAsPlaintextQuotation() // Create generic Transferable for getting the data nsCOMPtr trans; rv = nsComponentManager::CreateInstance(kCTransferableCID, nsnull, - nsITransferable::GetIID(), + NS_GET_IID(nsITransferable), (void**) getter_AddRefs(trans)); if (NS_SUCCEEDED(rv) && trans) { @@ -4222,7 +4223,7 @@ NS_IMETHODIMP nsHTMLEditor::OutputToString(nsString& aOutputString, nsCRT::free(type); rv = nsComponentManager::CreateInstance(progid, nsnull, - nsIDocumentEncoder::GetIID(), + NS_GET_IID(nsIDocumentEncoder), getter_AddRefs(encoder)); nsCRT::free(progid); @@ -4305,7 +4306,7 @@ NS_IMETHODIMP nsHTMLEditor::OutputToStream(nsIOutputStream* aOutputStream, nsCRT::free(type); rv = nsComponentManager::CreateInstance(progid, nsnull, - nsIDocumentEncoder::GetIID(), + NS_GET_IID(nsIDocumentEncoder), getter_AddRefs(encoder)); nsCRT::free(progid); @@ -4801,7 +4802,7 @@ nsresult nsHTMLEditor::GetAbsoluteOffsetsForPoints(nsIDOMNode *aInStartNode, nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; @@ -4888,7 +4889,7 @@ nsHTMLEditor::GetTextSelectionOffsetsForRange(nsIDOMSelection *aSelection, nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; @@ -4937,7 +4938,7 @@ void nsHTMLEditor::ResetTextSelectionForRange(nsIDOMNode *aParent, nsresult result; nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return; if (!iter) return; @@ -5002,7 +5003,7 @@ nsHTMLEditor::ReParentContentOfNode(nsIDOMNode *aNode, // find the current block parent, or just use aNode if it is a block node nsCOMPtrblockParentElement; nsCOMPtrnodeToReParent; // this is the node we'll operate on, by default it's aNode - nsresult res = aNode->QueryInterface(nsIDOMNode::GetIID(), getter_AddRefs(nodeToReParent)); + nsresult res = aNode->QueryInterface(NS_GET_IID(nsIDOMNode), getter_AddRefs(nodeToReParent)); PRBool nodeIsInline; PRBool nodeIsBlock=PR_FALSE; IsNodeInline(aNode, nodeIsInline); @@ -5010,7 +5011,7 @@ nsHTMLEditor::ReParentContentOfNode(nsIDOMNode *aNode, { nsresult QIResult; nsCOMPtrnodeAsText; - QIResult = aNode->QueryInterface(nsIDOMCharacterData::GetIID(), getter_AddRefs(nodeAsText)); + QIResult = aNode->QueryInterface(NS_GET_IID(nsIDOMCharacterData), getter_AddRefs(nodeAsText)); if (NS_FAILED(QIResult) || !nodeAsText) { nodeIsBlock=PR_TRUE; } @@ -5018,7 +5019,7 @@ nsHTMLEditor::ReParentContentOfNode(nsIDOMNode *aNode, // if aNode is the block parent, then the node to reparent is one of its children if (PR_TRUE==nodeIsBlock) { - res = aNode->QueryInterface(nsIDOMNode::GetIID(), getter_AddRefs(blockParentElement)); + res = aNode->QueryInterface(NS_GET_IID(nsIDOMNode), getter_AddRefs(blockParentElement)); if (NS_SUCCEEDED(res) && blockParentElement) { res = aNode->GetFirstChild(getter_AddRefs(nodeToReParent)); } @@ -6450,7 +6451,7 @@ nsHTMLEditor::SetTextPropertiesForNodeWithDifferentParents(nsIDOMRange *aRange, // create new parent nodes for all the content between the start and end nodes nsCOMPtriter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), getter_AddRefs(iter)); + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; @@ -6994,7 +6995,7 @@ nsHTMLEditor::RemoveTextPropertiesForNodeWithDifferentParents(nsIDOMNode *aStar nsCOMPtr range; result = nsComponentManager::CreateInstance(kCRangeCID, nsnull, - nsIDOMRange::GetIID(), + NS_GET_IID(nsIDOMRange), getter_AddRefs(range)); if (NS_FAILED(result)) { return result; } if (!range) { return NS_ERROR_NULL_POINTER; } @@ -7017,7 +7018,7 @@ nsHTMLEditor::RemoveTextPropertiesForNodeWithDifferentParents(nsIDOMNode *aStar nsVoidArray nodeList; nsCOMPtriter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), getter_AddRefs(iter)); + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; @@ -7202,7 +7203,7 @@ nsHTMLEditor::CollapseAdjacentTextNodes(nsIDOMSelection *aInSelection) nsCOMPtr range( do_QueryInterface(currentItem) ); nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; if (!iter) return NS_ERROR_NULL_POINTER; diff --git a/mozilla/extensions/cookie/nsCookie.cpp b/mozilla/extensions/cookie/nsCookie.cpp index a92039cc1d5..3c5625432f7 100644 --- a/mozilla/extensions/cookie/nsCookie.cpp +++ b/mozilla/extensions/cookie/nsCookie.cpp @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ #define alphabetize 1 @@ -193,7 +194,7 @@ cookie_Localize(char* genericString) { return v.ToNewUnicode(); } - ret = uri->QueryInterface(nsIURI::GetIID(), (void**)&url); + ret = uri->QueryInterface(NS_GET_IID(nsIURI), (void**)&url); nsServiceManager::ReleaseService(kIOServiceCID, pNetService); if (NS_FAILED(ret)) { diff --git a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp index 93ba43c9ee4..22a5af31320 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp @@ -727,7 +727,7 @@ NS_IMETHODIMP mozXMLTerminal::GetWebShell(nsIWebShell** aWebShell) NS_PRECONDITION(mWebShell, "bad state, null mWebShell"); if (!mWebShell) return NS_ERROR_NOT_INITIALIZED; - return mWebShell->QueryInterface(nsIWebShell::GetIID(), + return mWebShell->QueryInterface(NS_GET_IID(nsIWebShell), (void **)aWebShell); } diff --git a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp index b30cd48d74c..509b4fee719 100644 --- a/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp +++ b/mozilla/gfx/src/gtk/nsFontMetricsGTK.cpp @@ -2360,7 +2360,7 @@ nsFontMetricsGTK::FindGenericFont(nsFontSearch* aSearch) aSearch->mFont = nsnull; if (!gPref) { nsServiceManager::GetService(kPrefCID, - nsCOMTypeInfo::GetIID(), (nsISupports**) &gPref); + NS_GET_IID(nsIPref), (nsISupports**) &gPref); if (!gPref) { return; } diff --git a/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp b/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp index 7426288e707..84098a30263 100644 --- a/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp +++ b/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ #include "nsIPref.h" #include "nsIServiceManager.h" @@ -286,7 +287,7 @@ void nsUnicodeMappingUtil::InitFromPref() { if (!gPref) { nsServiceManager::GetService(kPrefCID, - nsCOMTypeInfo::GetIID(), (nsISupports**) &gPref); + NS_GET_IID(nsIPref), (nsISupports**) &gPref); if (!gPref) { return; } diff --git a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp index b49d6575a60..abd0dc7c26d 100644 --- a/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp +++ b/mozilla/gfx/src/xlib/nsFontMetricsXlib.cpp @@ -2311,7 +2311,7 @@ nsFontMetricsXlib::FindGenericFont(nsFontSearch* aSearch) aSearch->mFont = nsnull; if (!gPref) { nsServiceManager::GetService(kPrefCID, - nsCOMTypeInfo::GetIID(), (nsISupports**) &gPref); + NS_GET_IID(nsIPref), (nsISupports**) &gPref); if (!gPref) { return; } diff --git a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.h b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.h index 00bb7ad7a9d..7899ccb46c1 100644 --- a/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.h +++ b/mozilla/htmlparser/src/nsHTMLToTXTSinkStream.h @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ /** @@ -204,7 +205,7 @@ NS_New_HTMLToTXT_SinkStream(nsIHTMLContentSink** aInstancePtrResult, rv = nsComponentManager::CreateInstance(nsIHTMLToTXTSinkStream::GetCID(), nsnull, - nsIHTMLToTXTSinkStream::GetIID(), + NS_GET_IID(nsIHTMLToTXTSinkStream), getter_AddRefs(it)); if (NS_SUCCEEDED(rv)) { rv = it->Initialize(aOutStream, nsnull, aFlags); @@ -214,7 +215,7 @@ NS_New_HTMLToTXT_SinkStream(nsIHTMLContentSink** aInstancePtrResult, if (aCharsetOverride != nsnull) { it->SetCharsetOverride(aCharsetOverride); } - rv = it->QueryInterface(nsIHTMLContentSink::GetIID(), + rv = it->QueryInterface(NS_GET_IID(nsIHTMLContentSink), (void**)aInstancePtrResult); } } @@ -232,7 +233,7 @@ NS_New_HTMLToTXT_SinkStream(nsIHTMLContentSink** aInstancePtrResult, rv = nsComponentManager::CreateInstance(nsIHTMLToTXTSinkStream::GetCID(), nsnull, - nsIHTMLToTXTSinkStream::GetIID(), + NS_GET_IID(nsIHTMLToTXTSinkStream), getter_AddRefs(it)); if (NS_SUCCEEDED(rv)) { rv = it->Initialize(nsnull, aOutString, aFlags); @@ -241,7 +242,7 @@ NS_New_HTMLToTXT_SinkStream(nsIHTMLContentSink** aInstancePtrResult, it->SetWrapColumn(aWrapColumn); nsAutoString ucs2("ucs2"); it->SetCharsetOverride(&ucs2); - rv = it->QueryInterface(nsIHTMLContentSink::GetIID(), + rv = it->QueryInterface(NS_GET_IID(nsIHTMLContentSink), (void**)aInstancePtrResult); } } diff --git a/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp b/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp index 7f0d93f382a..d347c53f2e9 100644 --- a/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp +++ b/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ #if 1 @@ -77,7 +78,7 @@ extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* aServMgr, nsIComponentManager* compMgr; rv = servMgr->GetService(kComponentManagerCID, - nsIComponentManager::GetIID(), + NS_GET_IID(nsIComponentManager), (nsISupports**)&compMgr); if (NS_FAILED(rv)) { return rv; @@ -105,7 +106,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, nsIComponentManager* compMgr; rv = servMgr->GetService(kComponentManagerCID, - nsIComponentManager::GetIID(), + NS_GET_ID(nsIComponentManager), (nsISupports**)&compMgr); if (NS_FAILED(rv)) { return rv; diff --git a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp index 4e8d53a1427..5e85d8a138c 100644 --- a/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHTTPHandler.cpp @@ -363,7 +363,7 @@ nsHTTPHandler::NewPostDataStream(PRBool isFile, rv = NS_NewStringInputStream(getter_AddRefs(in), data); if (NS_FAILED(rv)) return rv; - rv = in->QueryInterface(nsIInputStream::GetIID(), (void**)result); + rv = in->QueryInterface(NS_GET_IID(nsIInputStream), (void**)result); return rv; } } diff --git a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.h b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.h index 00bb7ad7a9d..7899ccb46c1 100644 --- a/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.h +++ b/mozilla/parser/htmlparser/src/nsHTMLToTXTSinkStream.h @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ /** @@ -204,7 +205,7 @@ NS_New_HTMLToTXT_SinkStream(nsIHTMLContentSink** aInstancePtrResult, rv = nsComponentManager::CreateInstance(nsIHTMLToTXTSinkStream::GetCID(), nsnull, - nsIHTMLToTXTSinkStream::GetIID(), + NS_GET_IID(nsIHTMLToTXTSinkStream), getter_AddRefs(it)); if (NS_SUCCEEDED(rv)) { rv = it->Initialize(aOutStream, nsnull, aFlags); @@ -214,7 +215,7 @@ NS_New_HTMLToTXT_SinkStream(nsIHTMLContentSink** aInstancePtrResult, if (aCharsetOverride != nsnull) { it->SetCharsetOverride(aCharsetOverride); } - rv = it->QueryInterface(nsIHTMLContentSink::GetIID(), + rv = it->QueryInterface(NS_GET_IID(nsIHTMLContentSink), (void**)aInstancePtrResult); } } @@ -232,7 +233,7 @@ NS_New_HTMLToTXT_SinkStream(nsIHTMLContentSink** aInstancePtrResult, rv = nsComponentManager::CreateInstance(nsIHTMLToTXTSinkStream::GetCID(), nsnull, - nsIHTMLToTXTSinkStream::GetIID(), + NS_GET_IID(nsIHTMLToTXTSinkStream), getter_AddRefs(it)); if (NS_SUCCEEDED(rv)) { rv = it->Initialize(nsnull, aOutString, aFlags); @@ -241,7 +242,7 @@ NS_New_HTMLToTXT_SinkStream(nsIHTMLContentSink** aInstancePtrResult, it->SetWrapColumn(aWrapColumn); nsAutoString ucs2("ucs2"); it->SetCharsetOverride(&ucs2); - rv = it->QueryInterface(nsIHTMLContentSink::GetIID(), + rv = it->QueryInterface(NS_GET_IID(nsIHTMLContentSink), (void**)aInstancePtrResult); } } diff --git a/mozilla/rdf/content/src/nsXULKeyListener.cpp b/mozilla/rdf/content/src/nsXULKeyListener.cpp index 557cadea3a3..03873452392 100644 --- a/mozilla/rdf/content/src/nsXULKeyListener.cpp +++ b/mozilla/rdf/content/src/nsXULKeyListener.cpp @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ #include "nsCOMPtr.h" @@ -347,7 +348,7 @@ public: } }; -NS_IMPL_ISUPPORTS(nsProxyStream, nsIInputStream::GetIID()); +NS_IMPL_ISUPPORTS(nsProxyStream, NS_GET_IID(nsIInputStream)); //////////////////////////////////////////////////////////////////////// @@ -378,13 +379,13 @@ nsXULKeyListenerImpl::QueryInterface(REFNSIID iid, void** result) return NS_ERROR_NULL_POINTER; *result = nsnull; - if (iid.Equals(nsIXULKeyListener::GetIID()) || + if (iid.Equals(NS_GET_IID(nsIXULKeyListener)) || iid.Equals(kISupportsIID)) { *result = NS_STATIC_CAST(nsIXULKeyListener*, this); NS_ADDREF_THIS(); return NS_OK; } - else if (iid.Equals(nsIDOMKeyListener::GetIID())) { + else if (iid.Equals(NS_GET_IID(nsIDOMKeyListener))) { *result = NS_STATIC_CAST(nsIDOMKeyListener*, this); NS_ADDREF_THIS(); return NS_OK; @@ -545,7 +546,7 @@ nsresult nsXULKeyListenerImpl::DoKey(nsIDOMEvent* aKeyEvent, eEventType aEventTy webShell->GetContentViewer(getter_AddRefs(cv)); if (nsnull != cv) { nsCOMPtr docv; - cv->QueryInterface(nsIDocumentViewer::GetIID(), getter_AddRefs(docv)); + cv->QueryInterface(NS_GET_IID(nsIDocumentViewer), getter_AddRefs(docv)); if (nsnull != docv) { nsCOMPtr cx; docv->GetPresContext(*getter_AddRefs(cx)); @@ -1101,7 +1102,7 @@ NS_IMETHODIMP nsXULKeyListenerImpl::LoadKeyBindingDocument(nsIURI* aURI, nsIDOMX // Create the XUL document nsCOMPtr doc; nsresult rv = nsComponentManager::CreateInstance(kXULDocumentCID, nsnull, - nsIDOMXULDocument::GetIID(), + NS_GET_IID(nsIDOMXULDocument), getter_AddRefs(doc)); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/rdf/content/src/nsXULTreeElement.cpp b/mozilla/rdf/content/src/nsXULTreeElement.cpp index 740702d471c..2b2daf60f1b 100644 --- a/mozilla/rdf/content/src/nsXULTreeElement.cpp +++ b/mozilla/rdf/content/src/nsXULTreeElement.cpp @@ -397,7 +397,7 @@ nsXULTreeElement::SelectItemRange(nsIDOMXULElement* aStartItem, nsIDOMXULElement nsCOMPtr range; nsresult result; result = nsComponentManager::CreateInstance(kCRangeCID, nsnull, - nsIDOMRange::GetIID(), getter_AddRefs(range)); + NS_GET_IID(nsIDOMRange), getter_AddRefs(range)); PRInt32 startIndex = 0; PRInt32 endIndex = 0; @@ -431,7 +431,7 @@ nsXULTreeElement::SelectItemRange(nsIDOMXULElement* aStartItem, nsIDOMXULElement // Create the iterator nsCOMPtr iter; result = nsComponentManager::CreateInstance(kCContentIteratorCID, nsnull, - nsIContentIterator::GetIID(), + NS_GET_IID(nsIContentIterator), getter_AddRefs(iter)); if (NS_FAILED(result)) return result; diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp index 5e06aff2fd7..c8f9c814353 100644 --- a/mozilla/webshell/src/nsDocLoader.cpp +++ b/mozilla/webshell/src/nsDocLoader.cpp @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ #include "nspr.h" #include "prlog.h" @@ -271,7 +272,7 @@ nsDocLoaderImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(nsCOMTypeInfo::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsISupportsWeakReference))) { *aInstancePtr = NS_STATIC_CAST(nsISupportsWeakReference*,this); NS_ADDREF_THIS(); return NS_OK; @@ -1020,7 +1021,7 @@ nsresult NS_NewDocLoaderServiceFactory(nsIFactory** aResult) nsresult rv = NS_OK; nsIGenericFactory* factory; rv = nsComponentManager::CreateInstance(kGenericFactoryCID, nsnull, - nsIGenericFactory::GetIID(), + NS_GET_IID(nsIGenericFactory), (void**)&factory); if (NS_FAILED(rv)) return rv; diff --git a/mozilla/xpcom/tests/nsIFileTest.cpp b/mozilla/xpcom/tests/nsIFileTest.cpp index 4aa1096cd88..cd7016680f1 100644 --- a/mozilla/xpcom/tests/nsIFileTest.cpp +++ b/mozilla/xpcom/tests/nsIFileTest.cpp @@ -182,7 +182,7 @@ CopyTest(char *testFile, char *targetDir) nsresult rv = nsComponentManager::CreateInstance(NS_LOCAL_FILE_PROGID, NULL, - nsCOMTypeInfo::GetIID(), + NS_GET_IID(nsILocalFile), (void**)getter_AddRefs(file)); if (NS_FAILED(rv) || (!file)) @@ -195,7 +195,7 @@ CopyTest(char *testFile, char *targetDir) VerifyResult(rv); rv = nsComponentManager::CreateInstance(NS_LOCAL_FILE_PROGID, NULL, - nsCOMTypeInfo::GetIID(), + NS_GET_IID(nsILocalFile), (void**)getter_AddRefs(dir)); if (NS_FAILED(rv) || (!dir)) diff --git a/mozilla/xpcom/tools/registry/regxpcom.cpp b/mozilla/xpcom/tools/registry/regxpcom.cpp index f32c1a6e4c8..6b261493f54 100644 --- a/mozilla/xpcom/tools/registry/regxpcom.cpp +++ b/mozilla/xpcom/tools/registry/regxpcom.cpp @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ #include @@ -61,7 +62,7 @@ nsresult Register(const char *path) nsCOMPtr spec; nsresult rv = nsComponentManager::CreateInstance(NS_LOCAL_FILE_PROGID, nsnull, - nsCOMTypeInfo::GetIID(), + NS_GET_IID(nsILocalFile), getter_AddRefs(spec)); if (NS_FAILED(rv) || (!spec)) diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index 0a6b1e1cac3..7ce5812ca4e 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ @@ -298,7 +299,7 @@ nsAppShellService::EnumerateComponents( EnumeratorMemberFunction function ) { nsIEnumerator *components = 0; const char *failed = "GetService"; if ( NS_SUCCEEDED( ( rv = nsServiceManager::GetService( NS_REGISTRY_PROGID, - nsIRegistry::GetIID(), + NS_GET_IID(nsIRegistry), (nsISupports**)®istry ) ) ) && ( failed = "Open" ) @@ -390,7 +391,7 @@ nsAppShellService::InitializeComponent( const nsCID &aComponentCID ) { nsIAppShellComponent *component; nsresult rv = nsComponentManager::CreateInstance( aComponentCID, 0, - nsIAppShellComponent::GetIID(), + NS_GET_IID(nsIAppShellComponent), (void**)&component ); if ( NS_SUCCEEDED( rv ) ) { // Then tell it to initialize (it may RegisterService itself). @@ -421,7 +422,7 @@ nsAppShellService::ShutdownComponent( const nsCID &aComponentCID ) { // Attempt to create instance of the component (must be a service). nsIAppShellComponent *component; nsresult rv = nsServiceManager::GetService( aComponentCID, - nsIAppShellComponent::GetIID(), + NS_GET_IID(nsIAppShellComponent), (nsISupports**)&component ); if ( NS_SUCCEEDED( rv ) ) { // Instance accessed, tell it to shutdown. @@ -931,7 +932,7 @@ void nsAppShellService::RegisterObserver(PRBool aRegister) NS_ASSERTION(weObserve, "who's been chopping bits off nsAppShellService?"); rv = nsServiceManager::GetService(NS_OBSERVERSERVICE_PROGID, - nsIObserverService::GetIID(), &glop); + NS_GET_IID(nsIObserverService), &glop); if (NS_SUCCEEDED(rv)) { nsIObserverService *os = NS_STATIC_CAST(nsIObserverService*,glop); if (aRegister) { diff --git a/mozilla/xpfe/appshell/src/nsCommonDialogs.cpp b/mozilla/xpfe/appshell/src/nsCommonDialogs.cpp index 0714547684e..448dc59eb8f 100644 --- a/mozilla/xpfe/appshell/src/nsCommonDialogs.cpp +++ b/mozilla/xpfe/appshell/src/nsCommonDialogs.cpp @@ -18,6 +18,7 @@ * Rights Reserved. * * Contributor(s): + * Pierre Phaneuf */ #include "nsIDOMWindow.h" #include "nsICommonDialogs.h" @@ -185,7 +186,7 @@ NS_IMETHODIMP nsCommonDialogs::UniversalDialog nsIDialogParamBlock* block = NULL; rv = nsComponentManager::CreateInstance - (kDialogParamBlockCID, 0, nsIDialogParamBlock::GetIID(), (void**)&block ); + (kDialogParamBlockCID, 0, NS_GET_IID(nsIDialogParamBlock), (void**)&block ); if (NS_FAILED(rv)) { return rv; } diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp index 8b4f23ab4db..d5d1b082e88 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp @@ -232,7 +232,7 @@ nsBrowserAppCore::Init() rv = nsComponentManager::CreateInstance(NS_SHISTORY_PROGID, nsnull, - nsISHistory::GetIID(), + NS_GET_IID(nsISHistory), (void **) &mNewSHistory); if (NS_SUCCEEDED(rv)) { printf("**** Successfully created new Session History ****\n"); @@ -1540,7 +1540,7 @@ nsBrowserAppCore::OnEndDocumentLoad(nsIDocumentLoader* aLoader, nsIChannel* chan nsCOMPtr shEntry; rv = nsComponentManager::CreateInstance(NS_SHENTRY_PROGID, nsnull, - nsISHEntry::GetIID(), + NS_GET_IID(nsISHEntry), (void **) &shEntry); const PRUnichar * title=nsnull; @@ -1572,7 +1572,7 @@ nsBrowserAppCore::OnEndDocumentLoad(nsIDocumentLoader* aLoader, nsIChannel* chan nsCOMPtr shTransaction; rv = nsComponentManager::CreateInstance(NS_SHTRANSACTION_PROGID, nsnull, - nsISHTransaction::GetIID(), + NS_GET_IID(nsISHTransaction), (void **) &shTransaction); if (NS_SUCCEEDED(rv)) { printf("******* Successfully created nsSHEntry ********* \n"); diff --git a/mozilla/xpfe/components/shistory/src/nsSHEntry.cpp b/mozilla/xpfe/components/shistory/src/nsSHEntry.cpp index fc066708c0d..659a2fdb894 100644 --- a/mozilla/xpfe/components/shistory/src/nsSHEntry.cpp +++ b/mozilla/xpfe/components/shistory/src/nsSHEntry.cpp @@ -18,6 +18,7 @@ * * Contributor(s): * Radha Kulkarni + * Pierre Phaneuf */ #include "nsISupportsUtils.h" #include "nsIDOMDocument.h" @@ -363,7 +364,7 @@ nsSHEnumerator::CurrentItem(nsISHEntry **aItem) PRUint32 cnt = mSHEntry->mChildren.Count(); if (mIndex >=0 && mIndex < (PRInt32)cnt){ nsCOMPtr indexIsupports = (nsISHEntry *) mSHEntry->mChildren.ElementAt(mIndex); - return indexIsupports->QueryInterface(nsISHEntry::GetIID(),(void **)aItem); + return indexIsupports->QueryInterface(NS_GET_IID(nsISHEntry),(void **)aItem); } return NS_ERROR_FAILURE; } @@ -389,12 +390,12 @@ nsRangeListIterator::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsIEnumerator::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsIEnumerator))) { *aInstancePtr = NS_STATIC_CAST(nsIEnumerator*, this); NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(nsIBidirectionalEnumerator::GetIID())) { + if (aIID.Equals(NS_GET_IID(nsIBidirectionalEnumerator))) { *aInstancePtr = NS_STATIC_CAST(nsIBidirectionalEnumerator*, this); NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/xpfe/components/shistory/src/nsSHistory.cpp b/mozilla/xpfe/components/shistory/src/nsSHistory.cpp index d4ac242b82f..80169af354c 100644 --- a/mozilla/xpfe/components/shistory/src/nsSHistory.cpp +++ b/mozilla/xpfe/components/shistory/src/nsSHistory.cpp @@ -18,6 +18,7 @@ * * Contributor(s): * Radha Kulkarni + * Pierre Phaneuf */ #include "nsISupportsUtils.h" @@ -67,7 +68,7 @@ nsSHistory::AddEntry(nsISHEntry * aSHEntry) nsCOMPtr txn; rv = nsComponentManager::CreateInstance(NS_SHTRANSACTION_PROGID, nsnull, - nsISHTransaction::GetIID(), + NS_GET_IID(nsISHTransaction), getter_AddRefs(txn)); nsCOMPtr parent; diff --git a/mozilla/xpinstall/notifier/nsXPIFlash.cpp b/mozilla/xpinstall/notifier/nsXPIFlash.cpp index 195afc6598c..28f5971c4bf 100644 --- a/mozilla/xpinstall/notifier/nsXPIFlash.cpp +++ b/mozilla/xpinstall/notifier/nsXPIFlash.cpp @@ -19,7 +19,8 @@ * Rights Reserved. * * Contributor(s): - * Doug Turner + * Doug Turner + * Pierre Phaneuf */ #include "nsISupports.h" #include "nsIServiceManager.h" @@ -125,7 +126,7 @@ nsXPINotifierImpl::nsXPINotifierImpl() nsComponentManager::CreateInstance(kRDFInMemoryDataSourceCID, this, /* the "outer" */ - nsCOMTypeInfo::GetIID(), + NS_GET_IID(nsISupports), getter_AddRefs(mInner)); } @@ -242,7 +243,7 @@ nsXPINotifierImpl::Init() PRBool moreElements; // Read the distributor registry - rv = nsServiceManager::GetService(kRDFServiceCID, nsIRDFService::GetIID(), (nsISupports**) &mRDF); + rv = nsServiceManager::GetService(kRDFServiceCID, NS_GET_IID(nsIRDFService), (nsISupports**) &mRDF); if (NS_FAILED(rv)) return rv; if (! kXPI_NotifierSources) @@ -269,7 +270,7 @@ nsXPINotifierImpl::Init() rv = nsComponentManager::CreateInstance(kRDFContainerCID, nsnull, - nsIRDFContainer::GetIID(), + NS_GET_IID(nsIRDFContainer), getter_AddRefs(distributorsContainer)); if (NS_SUCCEEDED(rv)) @@ -449,7 +450,7 @@ nsXPINotifierImpl::OpenRemoteDataSource(const char* aURL, PRBool blocking, nsIRD nsCOMPtr remote; rv = nsComponentManager::CreateInstance(kRDFXMLDataSourceCID, nsnull, - nsIRDFRemoteDataSource::GetIID(), + NS_GET_IID(nsIRDFRemoteDataSource), getter_AddRefs(remote)); if (NS_FAILED(rv)) return rv; @@ -538,7 +539,7 @@ nsXPINotifierImpl::OnEndLoad(nsIRDFXMLSink *aSink) rv = nsComponentManager::CreateInstance(kRDFContainerCID, nsnull, - nsIRDFContainer::GetIID(), + NS_GET_IID(nsIRDFContainer), getter_AddRefs(distributorContainer)); if (NS_SUCCEEDED(rv)) { @@ -659,12 +660,12 @@ nsXPINotifierImpl::QueryInterface(REFNSIID aIID, void** aResult) { *aResult = NS_STATIC_CAST(nsISupports*, this); } - else if (aIID.Equals(nsIRDFDataSource::GetIID())) + else if (aIID.Equals(NS_GET_IID(nsIRDFDataSource))) { if (mInner) return mInner->QueryInterface(aIID, aResult); } - else if (aIID.Equals(nsIRDFXMLSinkObserver::GetIID())) + else if (aIID.Equals(NS_GET_IID(nsIRDFXMLSinkObserver))) { *aResult = NS_STATIC_CAST(nsIRDFXMLSinkObserver*, this); }