changing COM_auto_ptr to nsCOMPtr.h

editor/base/editor.cpp

@@ -126,7 +126,7 @@ nsEditor::~nsEditor()
 {
   //the autopointers will clear themselves up. 
   //but we need to also remove the listeners or we have a leak
-  COM_auto_ptr<nsIDOMEventReceiver> erP;
+  nsCOMPtr<nsIDOMEventReceiver> erP;
   nsresult t_result = mDomInterfaceP->QueryInterface(kIDOMEventReceiverIID, getter_AddRefs(erP));
   if (NS_SUCCEEDED( t_result )) 
   {
@@ -198,7 +198,7 @@ nsEditor::Init(nsIDOMDocument *aDomInterface)
 //    NS_NOTREACHED("Mouse Listener");
     return t_result;
   }
-  COM_auto_ptr<nsIDOMEventReceiver> erP;
+  nsCOMPtr<nsIDOMEventReceiver> erP;
   t_result = mDomInterfaceP->QueryInterface(kIDOMEventReceiverIID, getter_AddRefs(erP));
   if (NS_OK != t_result) 
   {
@@ -214,7 +214,7 @@ nsEditor::Init(nsIDOMDocument *aDomInterface)
   now to handle selection
   */
   /*
-  COM_auto_ptr<nsIDocument> document;
+  nsCOMPtr<nsIDocument> document;
   if (NS_SUCCEEDED(t_result = mDomInterfaceP->QueryInterface(kIDocumentIID, getter_AddRefs(document))))
   {
     if (!NS_SUCCEEDED(t_result = document->GetSelection(*getter_AddRefs(mSelectionP))))
@@ -306,9 +306,9 @@ nsEditor::MouseClick(int aX,int aY)
 nsresult
 nsEditor::AppendText(nsString *aStr)
 {
-  COM_auto_ptr<nsIDOMNode> currentNode;
-  COM_auto_ptr<nsIDOMNode> textNode;
-  COM_auto_ptr<nsIDOMText> text;
+  nsCOMPtr<nsIDOMNode> currentNode;
+  nsCOMPtr<nsIDOMNode> textNode;
+  nsCOMPtr<nsIDOMText> text;
   if (!aStr)
     return NS_ERROR_NULL_POINTER;
   if (NS_SUCCEEDED(GetCurrentNode(getter_AddRefs(currentNode))) && 
@@ -328,7 +328,7 @@ nsEditor::GetCurrentNode(nsIDOMNode ** aNode)
   if (!aNode)
     return NS_ERROR_NULL_POINTER;
   /* If no node set, get first text node */
-  COM_auto_ptr<nsIDOMElement> docNode;
+  nsCOMPtr<nsIDOMElement> docNode;
 
   if (NS_SUCCEEDED(mDomInterfaceP->GetDocumentElement(getter_AddRefs(docNode))))
   {
@@ -351,15 +351,15 @@ nsEditor::GetFirstTextNode(nsIDOMNode *aNode, nsIDOMNode **aRetNode)
   PRUint16 mType;
   PRBool mCNodes;
 
-  COM_auto_ptr<nsIDOMNode> answer;
+  nsCOMPtr<nsIDOMNode> answer;
   
   aNode->GetNodeType(&mType);
 
   if (nsIDOMNode::ELEMENT_NODE == mType) {
     if (NS_SUCCEEDED(aNode->HasChildNodes(&mCNodes)) && PR_TRUE == mCNodes) 
     {
-      COM_auto_ptr<nsIDOMNode> node1;
-      COM_auto_ptr<nsIDOMNode> node2;
+      nsCOMPtr<nsIDOMNode> node1;
+      nsCOMPtr<nsIDOMNode> node2;
 
       if (!NS_SUCCEEDED(aNode->GetFirstChild(getter_AddRefs(node1))))
       {

editor/base/editor.h

@@ -21,7 +21,7 @@
 #include "nsIContextLoader.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMEventListener.h"
-#include "COM_auto_ptr.h"
+#include "nsCOMPtr.h"
 #include "editorInterfaces.h"
 //#include "nsISelection.h"
 
@@ -38,10 +38,10 @@ PRMonitor *getEditorMonitor();
 class nsEditor : public nsIEditor
 {
 private:
-  COM_auto_ptr<nsIDOMDocument>      mDomInterfaceP;
-  COM_auto_ptr<nsIDOMEventListener> mKeyListenerP;
-  COM_auto_ptr<nsIDOMEventListener> mMouseListenerP;
-//  COM_auto_ptr<nsISelection>        mSelectionP;
+  nsCOMPtr<nsIDOMDocument>      mDomInterfaceP;
+  nsCOMPtr<nsIDOMEventListener> mKeyListenerP;
+  nsCOMPtr<nsIDOMEventListener> mMouseListenerP;
+//  nsCOMPtr<nsISelection>        mSelectionP;
 public:
   /** The default constructor. This should suffice. the setting of the interfaces is done
    *  after the construction of the editor class.

editor/base/editorInterfaces.cpp

@@ -219,7 +219,7 @@ nsEditorMouseListener::ProcessEvent(nsIDOMEvent* aEvent)
 nsresult
 nsEditorMouseListener::MouseDown(nsIDOMEvent* aMouseEvent)
 {
-  COM_auto_ptr<nsIDOMNode> target;
+  nsCOMPtr<nsIDOMNode> target;
   if (NS_OK == aMouseEvent->GetTarget(getter_AddRefs(target))) {
 //    nsSetCurrentNode(aTarget);
   }

editor/base/nsEditFactory.cpp

@@ -33,7 +33,7 @@ static NS_DEFINE_IID(kEditorCID,       NS_EDITOR_CID);
 nsresult
 getEditFactory(nsIFactory **aFactory)
 {
-  static COM_auto_ptr<nsIFactory>  g_pNSIFactory;
+  static nsCOMPtr<nsIFactory>  g_pNSIFactory;
   PR_EnterMonitor(getEditorMonitor());
   nsresult result = NS_ERROR_FAILURE;
   if (!g_pNSIFactory)

editor/core/editor.cpp

@@ -126,7 +126,7 @@ nsEditor::~nsEditor()
 {
   //the autopointers will clear themselves up. 
   //but we need to also remove the listeners or we have a leak
-  COM_auto_ptr<nsIDOMEventReceiver> erP;
+  nsCOMPtr<nsIDOMEventReceiver> erP;
   nsresult t_result = mDomInterfaceP->QueryInterface(kIDOMEventReceiverIID, getter_AddRefs(erP));
   if (NS_SUCCEEDED( t_result )) 
   {
@@ -198,7 +198,7 @@ nsEditor::Init(nsIDOMDocument *aDomInterface)
 //    NS_NOTREACHED("Mouse Listener");
     return t_result;
   }
-  COM_auto_ptr<nsIDOMEventReceiver> erP;
+  nsCOMPtr<nsIDOMEventReceiver> erP;
   t_result = mDomInterfaceP->QueryInterface(kIDOMEventReceiverIID, getter_AddRefs(erP));
   if (NS_OK != t_result) 
   {
@@ -214,7 +214,7 @@ nsEditor::Init(nsIDOMDocument *aDomInterface)
   now to handle selection
   */
   /*
-  COM_auto_ptr<nsIDocument> document;
+  nsCOMPtr<nsIDocument> document;
   if (NS_SUCCEEDED(t_result = mDomInterfaceP->QueryInterface(kIDocumentIID, getter_AddRefs(document))))
   {
     if (!NS_SUCCEEDED(t_result = document->GetSelection(*getter_AddRefs(mSelectionP))))
@@ -306,9 +306,9 @@ nsEditor::MouseClick(int aX,int aY)
 nsresult
 nsEditor::AppendText(nsString *aStr)
 {
-  COM_auto_ptr<nsIDOMNode> currentNode;
-  COM_auto_ptr<nsIDOMNode> textNode;
-  COM_auto_ptr<nsIDOMText> text;
+  nsCOMPtr<nsIDOMNode> currentNode;
+  nsCOMPtr<nsIDOMNode> textNode;
+  nsCOMPtr<nsIDOMText> text;
   if (!aStr)
     return NS_ERROR_NULL_POINTER;
   if (NS_SUCCEEDED(GetCurrentNode(getter_AddRefs(currentNode))) && 
@@ -328,7 +328,7 @@ nsEditor::GetCurrentNode(nsIDOMNode ** aNode)
   if (!aNode)
     return NS_ERROR_NULL_POINTER;
   /* If no node set, get first text node */
-  COM_auto_ptr<nsIDOMElement> docNode;
+  nsCOMPtr<nsIDOMElement> docNode;
 
   if (NS_SUCCEEDED(mDomInterfaceP->GetDocumentElement(getter_AddRefs(docNode))))
   {
@@ -351,15 +351,15 @@ nsEditor::GetFirstTextNode(nsIDOMNode *aNode, nsIDOMNode **aRetNode)
   PRUint16 mType;
   PRBool mCNodes;
 
-  COM_auto_ptr<nsIDOMNode> answer;
+  nsCOMPtr<nsIDOMNode> answer;
   
   aNode->GetNodeType(&mType);
 
   if (nsIDOMNode::ELEMENT_NODE == mType) {
     if (NS_SUCCEEDED(aNode->HasChildNodes(&mCNodes)) && PR_TRUE == mCNodes) 
     {
-      COM_auto_ptr<nsIDOMNode> node1;
-      COM_auto_ptr<nsIDOMNode> node2;
+      nsCOMPtr<nsIDOMNode> node1;
+      nsCOMPtr<nsIDOMNode> node2;
 
       if (!NS_SUCCEEDED(aNode->GetFirstChild(getter_AddRefs(node1))))
       {

editor/core/editor.h

@@ -21,7 +21,7 @@
 #include "nsIContextLoader.h"
 #include "nsIDOMDocument.h"
 #include "nsIDOMEventListener.h"
-#include "COM_auto_ptr.h"
+#include "nsCOMPtr.h"
 #include "editorInterfaces.h"
 //#include "nsISelection.h"
 
@@ -38,10 +38,10 @@ PRMonitor *getEditorMonitor();
 class nsEditor : public nsIEditor
 {
 private:
-  COM_auto_ptr<nsIDOMDocument>      mDomInterfaceP;
-  COM_auto_ptr<nsIDOMEventListener> mKeyListenerP;
-  COM_auto_ptr<nsIDOMEventListener> mMouseListenerP;
-//  COM_auto_ptr<nsISelection>        mSelectionP;
+  nsCOMPtr<nsIDOMDocument>      mDomInterfaceP;
+  nsCOMPtr<nsIDOMEventListener> mKeyListenerP;
+  nsCOMPtr<nsIDOMEventListener> mMouseListenerP;
+//  nsCOMPtr<nsISelection>        mSelectionP;
 public:
   /** The default constructor. This should suffice. the setting of the interfaces is done
    *  after the construction of the editor class.

editor/core/editorInterfaces.cpp

@@ -219,7 +219,7 @@ nsEditorMouseListener::ProcessEvent(nsIDOMEvent* aEvent)
 nsresult
 nsEditorMouseListener::MouseDown(nsIDOMEvent* aMouseEvent)
 {
-  COM_auto_ptr<nsIDOMNode> target;
+  nsCOMPtr<nsIDOMNode> target;
   if (NS_OK == aMouseEvent->GetTarget(getter_AddRefs(target))) {
 //    nsSetCurrentNode(aTarget);
   }

editor/core/nsEditFactory.cpp

@@ -33,7 +33,7 @@ static NS_DEFINE_IID(kEditorCID,       NS_EDITOR_CID);
 nsresult
 getEditFactory(nsIFactory **aFactory)
 {
-  static COM_auto_ptr<nsIFactory>  g_pNSIFactory;
+  static nsCOMPtr<nsIFactory>  g_pNSIFactory;
   PR_EnterMonitor(getEditorMonitor());
   nsresult result = NS_ERROR_FAILURE;
   if (!g_pNSIFactory)

editor/guimgr/src/nsEditGuiManager.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "nsEditGuiManager.h"
-#include "COM_auto_ptr.h"
+#include "nsCOMPtr.h"
 
 #define LOCK_GUI_MANAGER(mgr)
 #define UNLOCK_GUI_MANAGER(mgr)

editor/guimgr/src/nsGuiManagerFactory.cpp

@@ -21,7 +21,7 @@
 #include "nsGuiManagerFactory.h"
 #include "nsIEditor.h"
 #include "nsRepository.h"
-#include "COM_auto_ptr.h"
+#include "nsCOMPtr.h"
 
 static NS_DEFINE_IID(kISupportsIID,          NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIFactoryIID,           NS_IFACTORY_IID);
@@ -32,7 +32,7 @@ static NS_DEFINE_IID(kIGuiManagerFactoryIID, NS_IGUIMANAGERFACTORY_IID);
 nsresult
 getGuiManagerFactory(nsIFactory **aFactory)
 {
-  static COM_auto_ptr<nsIFactory>  g_pNSIFactory;
+  static nsCOMPtr<nsIFactory>  g_pNSIFactory;
 
   nsresult result = NS_ERROR_FAILURE;
   if (!g_pNSIFactory)

editor/txmgr/src/nsTransactionItem.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "nsTransactionItem.h"
-#include "COM_auto_ptr.h"
+#include "nsCOMPtr.h"
 
 nsTransactionItem::nsTransactionItem(nsITransaction *aTransaction)
     : mTransaction(aTransaction), mUndoStack(0), mRedoStack(0)

editor/txmgr/src/nsTransactionManager.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "nsTransactionManager.h"
-#include "COM_auto_ptr.h"
+#include "nsCOMPtr.h"
 
 #define LOCK_TX_MANAGER(mgr)
 #define UNLOCK_TX_MANAGER(mgr)

editor/txmgr/src/nsTransactionStack.cpp

@@ -17,7 +17,7 @@
  */
 
 #include "nsTransactionStack.h"
-#include "COM_auto_ptr.h"
+#include "nsCOMPtr.h"
 
 nsTransactionStack::nsTransactionStack()
   : mRF(), mQue(mRF)