Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-25 11:58:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed for nsCOMPtr: no construction or assignment from raw COM interface pointers

Browse Source
This commit is contained in:
scc%netscape.com 1999-03-02 22:27:46 +00:00
parent 8b2132aba2
commit b81fb21272
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/base/DeleteRangeTxn.cpp
View File

@ -224,7 +224,7 @@ NS_IMETHODIMP DeleteRangeTxn::CreateTxnsToDeleteBetween(nsIDOMNode *aStartParent
nsresult result;
// see what kind of node we have
nsCOMPtr<nsIDOMCharacterData> textNode;
textNode = aStartParent; // this uses implicit nsCOMPtr QI
textNode = do_QueryInterface(aStartParent);
if (textNode)
{ // if the node is a text node, then delete text content
DeleteTextTxn *txn;
@ -279,7 +279,7 @@ NS_IMETHODIMP DeleteRangeTxn::CreateTxnsToDeleteContent(nsIDOMNode *aParent,
nsresult result;
// see what kind of node we have
nsCOMPtr<nsIDOMCharacterData> textNode;
textNode = aParent; // this uses implicit nsCOMPtr QI
textNode = do_QueryInterface(aParent);
if (textNode)
{ // if the node is a text node, then delete text content
PRUint32 start, numToDelete;

4
editor/base/InsertTextTxn.cpp
View File

@ -99,7 +99,7 @@ NS_IMETHODIMP InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransacti
{
// if aTransaction isa InsertTextTxn, and if the selection hasn't changed,
// then absorb it
nsCOMPtr<InsertTextTxn> otherTxn(aTransaction);
nsCOMPtr<InsertTextTxn> otherTxn( do_QueryInterface(aTransaction) );
if (otherTxn)
{
if (PR_TRUE==IsSequentialInsert(otherTxn))
@ -112,7 +112,7 @@ NS_IMETHODIMP InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransacti
}
else
{ // the next InsertTextTxn might be inside an aggregate that we have special knowledge of
nsCOMPtr<EditAggregateTxn> otherTxn(aTransaction);
nsCOMPtr<EditAggregateTxn> otherTxn( do_QueryInterface(aTransaction) );
if (otherTxn)
{
nsCOMPtr<nsIAtom> txnName;

14
editor/base/nsEditor.cpp
View File

@ -880,7 +880,7 @@ NS_IMETHODIMP nsEditor::CreateTxnForInsertText(const nsString & aStringToInsert,
result = NS_ERROR_UNEXPECTED;
// XXX: we'll want to deleteRange if the selection isn't just an insertion point
// for now, just insert text after the start of the first node
nsCOMPtr<nsIDOMRange> range(currentItem);
nsCOMPtr<nsIDOMRange> range( do_QueryInterface(currentItem) );
if (range)
{
nsCOMPtr<nsIDOMNode> node;
@ -1116,7 +1116,7 @@ NS_IMETHODIMP nsEditor::CreateTxnForDeleteSelection(nsIEditor::Direction aDir,
result = enumerator->CurrentItem(&currentItem);
if ((NS_SUCCEEDED(result)) && (currentItem))
{
nsCOMPtr<nsIDOMRange> range(currentItem);
nsCOMPtr<nsIDOMRange> range( do_QueryInterface(currentItem) );
PRBool isCollapsed;
range->GetIsCollapsed(&isCollapsed);
if (PR_FALSE==isCollapsed)
@ -1482,8 +1482,8 @@ nsEditor::SplitNodeImpl(nsIDOMNode * aExistingRightNode,
if (0<=aOffset) // don't bother unless we're going to move at least one child
{
// if it's a text node, just shuffle around some text
nsCOMPtr<nsIDOMCharacterData> rightNodeAsText(aExistingRightNode);
nsCOMPtr<nsIDOMCharacterData> leftNodeAsText(aNewLeftNode);
nsCOMPtr<nsIDOMCharacterData> rightNodeAsText( do_QueryInterface(aExistingRightNode) );
nsCOMPtr<nsIDOMCharacterData> leftNodeAsText( do_QueryInterface(aNewLeftNode) );
if (leftNodeAsText && rightNodeAsText)
{
// fix right node
@ -1540,8 +1540,8 @@ nsEditor::JoinNodesImpl(nsIDOMNode * aNodeToKeep,
(nsnull!=aParent))
{
// if it's a text node, just shuffle around some text
nsCOMPtr<nsIDOMCharacterData> keepNodeAsText(aNodeToKeep);
nsCOMPtr<nsIDOMCharacterData> joinNodeAsText(aNodeToJoin);
nsCOMPtr<nsIDOMCharacterData> keepNodeAsText( do_QueryInterface(aNodeToKeep) );
nsCOMPtr<nsIDOMCharacterData> joinNodeAsText( do_QueryInterface(aNodeToJoin) );
if (keepNodeAsText && joinNodeAsText)
{
nsString rightText;
@ -1651,7 +1651,7 @@ NS_IMETHODIMP nsEditor::GetLayoutObject(nsIDOMNode *aNode, nsISupports **aLayout
{
if ((nsnull!=aNode))
{ // get the content interface
nsCOMPtr<nsIContent> nodeAsContent(aNode);
nsCOMPtr<nsIContent> nodeAsContent( do_QueryInterface(aNode) );
if (nodeAsContent)
{ // get the frame from the content interface
nsISupports *layoutObject=nsnull; // frames are not ref counted, so don't use an nsCOMPtr

12
editor/base/nsTextEditor.cpp
View File

@ -159,7 +159,7 @@ NS_IMETHODIMP nsTextEditor::SetTextProperty(nsIAtom *aProperty)
result = enumerator->CurrentItem(&currentItem);
if ((NS_SUCCEEDED(result)) && (nsnull!=currentItem))
{
nsCOMPtr<nsIDOMRange> range(currentItem);
nsCOMPtr<nsIDOMRange> range( do_QueryInterface(currentItem) );
nsCOMPtr<nsIDOMNode>commonParent;
result = range->GetCommonParent(getter_AddRefs(commonParent));
if ((NS_SUCCEEDED(result)) && commonParent)
@ -245,7 +245,7 @@ NS_IMETHODIMP nsTextEditor::GetTextProperty(nsIAtom *aProperty, PRBool &aAny, PR
result = enumerator->CurrentItem(&currentItem);
if ((NS_SUCCEEDED(result)) && currentItem)
{
nsCOMPtr<nsIDOMRange> range(currentItem);
nsCOMPtr<nsIDOMRange> range( do_QueryInterface(currentItem) );
nsCOMPtr<nsIContentIterator> iter;
result = nsRepository::CreateInstance(kCContentIteratorCID, nsnull,
kIContentIteratorIID,
@ -604,7 +604,7 @@ NS_IMETHODIMP nsTextEditor::SetTextPropertiesForNode(nsIDOMNode *aNode,
{
nsresult result=NS_OK;
nsCOMPtr<nsIDOMCharacterData>nodeAsChar;
nodeAsChar = aNode;
nodeAsChar = do_QueryInterface(aNode);
if (!nodeAsChar)
return NS_ERROR_FAILURE;
PRUint32 count;
@ -667,7 +667,7 @@ nsTextEditor::SetTextPropertiesForNodesWithSameParent(nsIDOMNode *aStartNode,
if (NS_SUCCEEDED(result))
{
nsCOMPtr<nsIDOMCharacterData>endNodeAsChar;
endNodeAsChar = aEndNode;
endNodeAsChar = do_QueryInterface(aEndNode);
if (!endNodeAsChar)
return NS_ERROR_FAILURE;
PRUint32 count;
@ -765,7 +765,7 @@ nsTextEditor::SetTextPropertiesForNodeWithDifferentParents(nsIDOMRange *aRange,
return result;
}
nsCOMPtr<nsIDOMCharacterData>nodeAsChar;
nodeAsChar = aStartNode;
nodeAsChar = do_QueryInterface(aStartNode);
if (!nodeAsChar)
return NS_ERROR_FAILURE;
PRUint32 count;
@ -777,7 +777,7 @@ nsTextEditor::SetTextPropertiesForNodeWithDifferentParents(nsIDOMRange *aRange,
if (NS_FAILED(result)) {
return result;
}
nodeAsChar = aEndNode;
nodeAsChar = do_QueryInterface(aEndNode);
if (!nodeAsChar)
return NS_ERROR_FAILURE;
nodeAsChar->GetLength(&count);

4
editor/libeditor/base/DeleteRangeTxn.cpp
View File

@ -224,7 +224,7 @@ NS_IMETHODIMP DeleteRangeTxn::CreateTxnsToDeleteBetween(nsIDOMNode *aStartParent
nsresult result;
// see what kind of node we have
nsCOMPtr<nsIDOMCharacterData> textNode;
textNode = aStartParent; // this uses implicit nsCOMPtr QI
textNode = do_QueryInterface(aStartParent);
if (textNode)
{ // if the node is a text node, then delete text content
DeleteTextTxn *txn;
@ -279,7 +279,7 @@ NS_IMETHODIMP DeleteRangeTxn::CreateTxnsToDeleteContent(nsIDOMNode *aParent,
nsresult result;
// see what kind of node we have
nsCOMPtr<nsIDOMCharacterData> textNode;
textNode = aParent; // this uses implicit nsCOMPtr QI
textNode = do_QueryInterface(aParent);
if (textNode)
{ // if the node is a text node, then delete text content
PRUint32 start, numToDelete;

4
editor/libeditor/base/InsertTextTxn.cpp
View File

@ -99,7 +99,7 @@ NS_IMETHODIMP InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransacti
{
// if aTransaction isa InsertTextTxn, and if the selection hasn't changed,
// then absorb it
nsCOMPtr<InsertTextTxn> otherTxn(aTransaction);
nsCOMPtr<InsertTextTxn> otherTxn( do_QueryInterface(aTransaction) );
if (otherTxn)
{
if (PR_TRUE==IsSequentialInsert(otherTxn))
@ -112,7 +112,7 @@ NS_IMETHODIMP InsertTextTxn::Merge(PRBool *aDidMerge, nsITransaction *aTransacti
}
else
{ // the next InsertTextTxn might be inside an aggregate that we have special knowledge of
nsCOMPtr<EditAggregateTxn> otherTxn(aTransaction);
nsCOMPtr<EditAggregateTxn> otherTxn( do_QueryInterface(aTransaction) );
if (otherTxn)
{
nsCOMPtr<nsIAtom> txnName;

14
editor/libeditor/base/nsEditor.cpp
View File

@ -880,7 +880,7 @@ NS_IMETHODIMP nsEditor::CreateTxnForInsertText(const nsString & aStringToInsert,
result = NS_ERROR_UNEXPECTED;
// XXX: we'll want to deleteRange if the selection isn't just an insertion point
// for now, just insert text after the start of the first node
nsCOMPtr<nsIDOMRange> range(currentItem);
nsCOMPtr<nsIDOMRange> range( do_QueryInterface(currentItem) );
if (range)
{
nsCOMPtr<nsIDOMNode> node;
@ -1116,7 +1116,7 @@ NS_IMETHODIMP nsEditor::CreateTxnForDeleteSelection(nsIEditor::Direction aDir,
result = enumerator->CurrentItem(&currentItem);
if ((NS_SUCCEEDED(result)) && (currentItem))
{
nsCOMPtr<nsIDOMRange> range(currentItem);
nsCOMPtr<nsIDOMRange> range( do_QueryInterface(currentItem) );
PRBool isCollapsed;
range->GetIsCollapsed(&isCollapsed);
if (PR_FALSE==isCollapsed)
@ -1482,8 +1482,8 @@ nsEditor::SplitNodeImpl(nsIDOMNode * aExistingRightNode,
if (0<=aOffset) // don't bother unless we're going to move at least one child
{
// if it's a text node, just shuffle around some text
nsCOMPtr<nsIDOMCharacterData> rightNodeAsText(aExistingRightNode);
nsCOMPtr<nsIDOMCharacterData> leftNodeAsText(aNewLeftNode);
nsCOMPtr<nsIDOMCharacterData> rightNodeAsText( do_QueryInterface(aExistingRightNode) );
nsCOMPtr<nsIDOMCharacterData> leftNodeAsText( do_QueryInterface(aNewLeftNode) );
if (leftNodeAsText && rightNodeAsText)
{
// fix right node
@ -1540,8 +1540,8 @@ nsEditor::JoinNodesImpl(nsIDOMNode * aNodeToKeep,
(nsnull!=aParent))
{
// if it's a text node, just shuffle around some text
nsCOMPtr<nsIDOMCharacterData> keepNodeAsText(aNodeToKeep);
nsCOMPtr<nsIDOMCharacterData> joinNodeAsText(aNodeToJoin);
nsCOMPtr<nsIDOMCharacterData> keepNodeAsText( do_QueryInterface(aNodeToKeep) );
nsCOMPtr<nsIDOMCharacterData> joinNodeAsText( do_QueryInterface(aNodeToJoin) );
if (keepNodeAsText && joinNodeAsText)
{
nsString rightText;
@ -1651,7 +1651,7 @@ NS_IMETHODIMP nsEditor::GetLayoutObject(nsIDOMNode *aNode, nsISupports **aLayout
{
if ((nsnull!=aNode))
{ // get the content interface
nsCOMPtr<nsIContent> nodeAsContent(aNode);
nsCOMPtr<nsIContent> nodeAsContent( do_QueryInterface(aNode) );
if (nodeAsContent)
{ // get the frame from the content interface
nsISupports *layoutObject=nsnull; // frames are not ref counted, so don't use an nsCOMPtr

2
rdf/content/src/nsRDFTreeBuilder.cpp
View File

@ -830,7 +830,7 @@ RDFTreeBuilderImpl::OnAssert(nsIRDFResource* aSubject,
}
for (PRInt32 i = elements->Count() - 1; i >= 0; --i) {
nsCOMPtr<nsIContent> element(elements->ElementAt(i));
nsCOMPtr<nsIContent> element( do_QueryInterface(elements->ElementAt(i)) );
// XXX somehow figure out if building XUL kids on this
// particular element makes any sense whatsoever.

2
rdf/content/src/nsRDFXULBuilder.cpp
View File

@ -1412,7 +1412,7 @@ RDFXULBuilderImpl::CreateXULElement(nsIRDFResource* aResource,
// Set the document for this XUL element. It must be set now
// in order for event handlers to be detected in the subsequent
// SetAttribute calls.
nsCOMPtr<nsIDocument> document(mDocument);
nsCOMPtr<nsIDocument> document( do_QueryInterface(mDocument) );
element->SetDocument(document, PR_FALSE);
// Now iterate through all the properties and add them as