From 0e04d56d207b669853682de8569473e0491112d4 Mon Sep 17 00:00:00 2001 From: "akkana%netscape.com" Date: Thu, 21 Jan 1999 19:31:57 +0000 Subject: [PATCH] Fix nsCOMPtr casting build bustage --- editor/base/DeleteElementTxn.cpp | 4 ++-- editor/base/DeleteRangeTxn.cpp | 10 +++++----- editor/base/editor.cpp | 2 +- editor/core/DeleteElementTxn.cpp | 4 ++-- editor/core/DeleteRangeTxn.cpp | 10 +++++----- editor/core/editor.cpp | 2 +- editor/libeditor/base/DeleteElementTxn.cpp | 4 ++-- editor/libeditor/base/DeleteRangeTxn.cpp | 10 +++++----- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/editor/base/DeleteElementTxn.cpp b/editor/base/DeleteElementTxn.cpp index 5b55f78a54fc..5d862b7ef390 100644 --- a/editor/base/DeleteElementTxn.cpp +++ b/editor/base/DeleteElementTxn.cpp @@ -51,11 +51,11 @@ nsresult DeleteElementTxn::Do(void) return NS_ERROR_NULL_POINTER; #ifdef NS_DEBUG // begin debug output - nsCOMPtr element=mElement; + nsCOMPtr element=mElement.get(); nsAutoString elementTag="text node"; if (element) element->GetTagName(elementTag); - nsCOMPtr parentElement=mParent; + nsCOMPtr parentElement = (nsCOMPtr)mParent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); diff --git a/editor/base/DeleteRangeTxn.cpp b/editor/base/DeleteRangeTxn.cpp index 2b86d56db6a4..356cbf3f3a27 100644 --- a/editor/base/DeleteRangeTxn.cpp +++ b/editor/base/DeleteRangeTxn.cpp @@ -364,11 +364,11 @@ nsresult DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsIDOMNode *aCommonParen break; #ifdef NS_DEBUG // begin debug output - nsCOMPtr childElement=child; + nsCOMPtr childElement = (nsCOMPtr)child; nsAutoString childElementTag="text node"; if (childElement) childElement->GetTagName(childElementTag); - nsCOMPtr parentElement=parent; + nsCOMPtr parentElement = (nsCOMPtr)parent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); @@ -426,11 +426,11 @@ nsresult DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsIDOMNode *aCommonParen break; #ifdef NS_DEBUG // begin debug output - nsCOMPtr childElement=child; + nsCOMPtr childElement = (nsCOMPtr)child; nsAutoString childElementTag="text node"; if (childElement) childElement->GetTagName(childElementTag); - nsCOMPtr parentElement=parent; + nsCOMPtr parentElement = (nsCOMPtr)parent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); @@ -481,7 +481,7 @@ nsresult DeleteRangeTxn::BuildAncestorList(nsIDOMNode *aNode, nsISupportsArray * aList->AppendElement(parentAsISupports); #ifdef NS_DEBUG // begin debug output - nsCOMPtr parentElement=parent; + nsCOMPtr parentElement = (nsCOMPtr)parent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); diff --git a/editor/base/editor.cpp b/editor/base/editor.cpp index ad002f187fae..7d661001b543 100644 --- a/editor/base/editor.cpp +++ b/editor/base/editor.cpp @@ -718,7 +718,7 @@ nsresult nsEditor::InsertText(const nsString& aStringToInsert) result = range->GetStartParent(getter_AddRefs(node)); if ((NS_SUCCEEDED(result)) && (node)) { - nsCOMPtr nodeAsText = node; + nsCOMPtr nodeAsText = (nsCOMPtr)node; if (nodeAsText) { PRInt32 offset; diff --git a/editor/core/DeleteElementTxn.cpp b/editor/core/DeleteElementTxn.cpp index 5b55f78a54fc..5d862b7ef390 100644 --- a/editor/core/DeleteElementTxn.cpp +++ b/editor/core/DeleteElementTxn.cpp @@ -51,11 +51,11 @@ nsresult DeleteElementTxn::Do(void) return NS_ERROR_NULL_POINTER; #ifdef NS_DEBUG // begin debug output - nsCOMPtr element=mElement; + nsCOMPtr element=mElement.get(); nsAutoString elementTag="text node"; if (element) element->GetTagName(elementTag); - nsCOMPtr parentElement=mParent; + nsCOMPtr parentElement = (nsCOMPtr)mParent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); diff --git a/editor/core/DeleteRangeTxn.cpp b/editor/core/DeleteRangeTxn.cpp index 2b86d56db6a4..356cbf3f3a27 100644 --- a/editor/core/DeleteRangeTxn.cpp +++ b/editor/core/DeleteRangeTxn.cpp @@ -364,11 +364,11 @@ nsresult DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsIDOMNode *aCommonParen break; #ifdef NS_DEBUG // begin debug output - nsCOMPtr childElement=child; + nsCOMPtr childElement = (nsCOMPtr)child; nsAutoString childElementTag="text node"; if (childElement) childElement->GetTagName(childElementTag); - nsCOMPtr parentElement=parent; + nsCOMPtr parentElement = (nsCOMPtr)parent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); @@ -426,11 +426,11 @@ nsresult DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsIDOMNode *aCommonParen break; #ifdef NS_DEBUG // begin debug output - nsCOMPtr childElement=child; + nsCOMPtr childElement = (nsCOMPtr)child; nsAutoString childElementTag="text node"; if (childElement) childElement->GetTagName(childElementTag); - nsCOMPtr parentElement=parent; + nsCOMPtr parentElement = (nsCOMPtr)parent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); @@ -481,7 +481,7 @@ nsresult DeleteRangeTxn::BuildAncestorList(nsIDOMNode *aNode, nsISupportsArray * aList->AppendElement(parentAsISupports); #ifdef NS_DEBUG // begin debug output - nsCOMPtr parentElement=parent; + nsCOMPtr parentElement = (nsCOMPtr)parent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); diff --git a/editor/core/editor.cpp b/editor/core/editor.cpp index ad002f187fae..7d661001b543 100644 --- a/editor/core/editor.cpp +++ b/editor/core/editor.cpp @@ -718,7 +718,7 @@ nsresult nsEditor::InsertText(const nsString& aStringToInsert) result = range->GetStartParent(getter_AddRefs(node)); if ((NS_SUCCEEDED(result)) && (node)) { - nsCOMPtr nodeAsText = node; + nsCOMPtr nodeAsText = (nsCOMPtr)node; if (nodeAsText) { PRInt32 offset; diff --git a/editor/libeditor/base/DeleteElementTxn.cpp b/editor/libeditor/base/DeleteElementTxn.cpp index 5b55f78a54fc..5d862b7ef390 100644 --- a/editor/libeditor/base/DeleteElementTxn.cpp +++ b/editor/libeditor/base/DeleteElementTxn.cpp @@ -51,11 +51,11 @@ nsresult DeleteElementTxn::Do(void) return NS_ERROR_NULL_POINTER; #ifdef NS_DEBUG // begin debug output - nsCOMPtr element=mElement; + nsCOMPtr element=mElement.get(); nsAutoString elementTag="text node"; if (element) element->GetTagName(elementTag); - nsCOMPtr parentElement=mParent; + nsCOMPtr parentElement = (nsCOMPtr)mParent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); diff --git a/editor/libeditor/base/DeleteRangeTxn.cpp b/editor/libeditor/base/DeleteRangeTxn.cpp index 2b86d56db6a4..356cbf3f3a27 100644 --- a/editor/libeditor/base/DeleteRangeTxn.cpp +++ b/editor/libeditor/base/DeleteRangeTxn.cpp @@ -364,11 +364,11 @@ nsresult DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsIDOMNode *aCommonParen break; #ifdef NS_DEBUG // begin debug output - nsCOMPtr childElement=child; + nsCOMPtr childElement = (nsCOMPtr)child; nsAutoString childElementTag="text node"; if (childElement) childElement->GetTagName(childElementTag); - nsCOMPtr parentElement=parent; + nsCOMPtr parentElement = (nsCOMPtr)parent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); @@ -426,11 +426,11 @@ nsresult DeleteRangeTxn::CreateTxnsToDeleteNodesBetween(nsIDOMNode *aCommonParen break; #ifdef NS_DEBUG // begin debug output - nsCOMPtr childElement=child; + nsCOMPtr childElement = (nsCOMPtr)child; nsAutoString childElementTag="text node"; if (childElement) childElement->GetTagName(childElementTag); - nsCOMPtr parentElement=parent; + nsCOMPtr parentElement = (nsCOMPtr)parent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag); @@ -481,7 +481,7 @@ nsresult DeleteRangeTxn::BuildAncestorList(nsIDOMNode *aNode, nsISupportsArray * aList->AppendElement(parentAsISupports); #ifdef NS_DEBUG // begin debug output - nsCOMPtr parentElement=parent; + nsCOMPtr parentElement = (nsCOMPtr)parent; nsAutoString parentElementTag="text node"; if (parentElement) parentElement->GetTagName(parentElementTag);