From 2e4423d60ca069f913fb8d5db40d5ffd20e25ec0 Mon Sep 17 00:00:00 2001
From: "waterson%netscape.com"
 <waterson%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 20 Apr 2000 09:15:23 +0000
Subject: [PATCH] Replace raw use of nsArrayEnumerator with
 NS_NewArrayEnumerator(). r=sspitzer, alecf

git-svn-id: svn://10.0.0.236/trunk@66540 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../base/src/nsMessageViewDataSource.cpp        |  8 +-------
 .../mailnews/base/src/nsMsgAccountManagerDS.cpp | 17 ++++-------------
 .../mailnews/base/src/nsMsgFolderDataSource.cpp | 10 +---------
 .../base/src/nsMsgMessageDataSource.cpp         |  8 +-------
 .../mailnews/base/src/nsMsgRDFDataSource.cpp    | 11 +----------
 5 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/mozilla/mailnews/base/src/nsMessageViewDataSource.cpp b/mozilla/mailnews/base/src/nsMessageViewDataSource.cpp
index a1fda1afe80..8c3903ac961 100644
--- a/mozilla/mailnews/base/src/nsMessageViewDataSource.cpp
+++ b/mozilla/mailnews/base/src/nsMessageViewDataSource.cpp
@@ -339,13 +339,7 @@ NS_IMETHODIMP nsMessageViewDataSource::ArcLabelsOut(nsIRDFResource* source,
 				NS_IF_RELEASE(messageEnumerator);
 			}
 		}
-		nsArrayEnumerator* cursor =
-			new nsArrayEnumerator(arcs);
-		if (cursor == nsnull)
-			return NS_ERROR_OUT_OF_MEMORY;
-		NS_ADDREF(cursor);
-		*labels = cursor;
-		return NS_OK;
+		return NS_NewArrayEnumerator(labels, arcs);
 	}
 	if(mDataSource)
 		return mDataSource->ArcLabelsOut(source, labels);
diff --git a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp
index 646555ed1c3..a2dc7ad93a5 100644
--- a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp
+++ b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp
@@ -400,13 +400,9 @@ nsMsgAccountManagerDataSource::GetTargets(nsIRDFResource *source,
   nsCOMPtr<nsISupportsArray> nodes;
   rv = NS_NewISupportsArray(getter_AddRefs(nodes));
   if (NS_FAILED(rv)) return rv;
-  
-  nsISimpleEnumerator* enumerator =
-    new nsArrayEnumerator(nodes);
-  if (!enumerator) return NS_ERROR_OUT_OF_MEMORY;
 
-  *_retval = enumerator;
-  NS_ADDREF(*_retval);
+  rv = NS_NewArrayEnumerator(_retval, nodes);
+  if (NS_FAILED(rv)) return rv;
 
 #ifdef DEBUG_amds
   nsXPIDLCString source_value;
@@ -623,14 +619,9 @@ nsMsgAccountManagerDataSource::ArcLabelsOut(nsIRDFResource *source,
   else
       rv = getAccountArcs(getter_AddRefs(arcs));
   NS_ENSURE_SUCCESS(rv, rv);
-  
-  nsArrayEnumerator* enumerator =
-    new nsArrayEnumerator(arcs);
 
-  NS_ENSURE_TRUE(enumerator, NS_ERROR_OUT_OF_MEMORY);
-  
-  *_retval = enumerator;
-  NS_ADDREF(*_retval);
+  rv = NS_NewArrayEnumerator(_retval, arcs);
+  if (NS_FAILED(rv)) return rv;
   
 #ifdef DEBUG_amds_
   printf("GetArcLabelsOut(%s): Adding child, settings, and name arclabels\n", value);
diff --git a/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp b/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp
index 67763511801..e312e6024de 100644
--- a/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp
+++ b/mozilla/mailnews/base/src/nsMsgFolderDataSource.cpp
@@ -439,15 +439,7 @@ NS_IMETHODIMP nsMsgFolderDataSource::GetTargets(nsIRDFResource* source,
   if(!*targets)
   {
 	  //create empty cursor
-	  nsCOMPtr<nsISupportsArray> assertions;
-      NS_NewISupportsArray(getter_AddRefs(assertions));
-	  nsArrayEnumerator* cursor = 
-		  new nsArrayEnumerator(assertions);
-	  if(cursor == nsnull)
-		  return NS_ERROR_OUT_OF_MEMORY;
-	  NS_ADDREF(cursor);
-	  *targets = cursor;
-	  rv = NS_OK;
+	  rv = NS_NewEmptyEnumerator(targets);
   }
 
   return rv;
diff --git a/mozilla/mailnews/base/src/nsMsgMessageDataSource.cpp b/mozilla/mailnews/base/src/nsMsgMessageDataSource.cpp
index f15811df647..5d9a580137c 100644
--- a/mozilla/mailnews/base/src/nsMsgMessageDataSource.cpp
+++ b/mozilla/mailnews/base/src/nsMsgMessageDataSource.cpp
@@ -447,13 +447,7 @@ NS_IMETHODIMP nsMsgMessageDataSource::GetTargets(nsIRDFResource* source,
 		if(NS_FAILED(rv))
 			return rv;
 
-	  nsArrayEnumerator* cursor = 
-		  new nsArrayEnumerator(assertions);
-	  if(cursor == nsnull)
-		  return NS_ERROR_OUT_OF_MEMORY;
-	  NS_ADDREF(cursor);
-	  *targets = cursor;
-	  rv = NS_OK;
+    rv = NS_NewArrayEnumerator(targets, assertions);
 	}
 	return rv;
 }
diff --git a/mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp b/mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp
index 59223e2beaf..a86b249be4e 100644
--- a/mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp
+++ b/mozilla/mailnews/base/src/nsMsgRDFDataSource.cpp
@@ -210,16 +210,7 @@ nsMsgRDFDataSource::ArcLabelsIn(nsIRDFNode *aNode, nsISimpleEnumerator **_retval
   if(NS_FAILED(rv))
 	  return rv;
 
-  nsArrayEnumerator* arrayEnumerator =
-    new nsArrayEnumerator(arcs);
-  
-  if (arrayEnumerator == nsnull)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  NS_ADDREF(arrayEnumerator);
-  *_retval = arrayEnumerator;
-
-  return NS_OK;
+  return NS_NewArrayEnumerator(_retval, arcs);
 }