Converting ::GetIID() into NS_GET_IID(). Bug #20232. r=scc, r=mozbot
git-svn-id: svn://10.0.0.236/trunk@59537 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
* Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Pierre Phaneuf <pp@ludusdesign.com>
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -168,7 +169,7 @@ nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult)
|
||||
{
|
||||
nsContentIterator * iter = new nsContentIterator();
|
||||
if (iter)
|
||||
return iter->QueryInterface(nsIContentIterator::GetIID(), (void**) aInstancePtrResult);
|
||||
return iter->QueryInterface(NS_GET_IID(nsIContentIterator), (void**) aInstancePtrResult);
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
@@ -194,13 +195,13 @@ nsresult nsContentIterator::QueryInterface(const nsIID& aIID,
|
||||
NS_ADDREF_THIS();
|
||||
return NS_OK;
|
||||
}
|
||||
/* if (aIID.Equals(nsIEnumerator::GetIID()))
|
||||
/* if (aIID.Equals(NS_GET_IID(nsIEnumerator)))
|
||||
{
|
||||
*aInstancePtrResult = (void*)(nsIEnumerator*)this;
|
||||
NS_ADDREF_THIS();
|
||||
return NS_OK;
|
||||
} */
|
||||
if (aIID.Equals(nsIContentIterator::GetIID()))
|
||||
if (aIID.Equals(NS_GET_IID(nsIContentIterator)))
|
||||
{
|
||||
*aInstancePtrResult = (void*)(nsIContentIterator*)this;
|
||||
NS_ADDREF_THIS();
|
||||
@@ -718,7 +719,7 @@ nsresult nsContentIterator::CurrentNode(nsIContent **aNode)
|
||||
return NS_ERROR_FAILURE;
|
||||
if (mIsDone)
|
||||
return NS_ERROR_FAILURE;
|
||||
return mCurNode->QueryInterface(nsIContent::GetIID(), (void**) aNode);
|
||||
return mCurNode->QueryInterface(NS_GET_IID(nsIContent), (void**) aNode);
|
||||
}
|
||||
|
||||
|
||||
@@ -788,7 +789,7 @@ nsresult NS_NewContentSubtreeIterator(nsIContentIterator** aInstancePtrResult)
|
||||
{
|
||||
nsContentIterator * iter = new nsContentSubtreeIterator();
|
||||
if (iter)
|
||||
return iter->QueryInterface(nsIContentIterator::GetIID(), (void**) aInstancePtrResult);
|
||||
return iter->QueryInterface(NS_GET_IID(nsIContentIterator), (void**) aInstancePtrResult);
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user