Bug 406198 Correct some enumerator instance usages in mailnews to NewEmptyEnumerator, and move some away from nsISupportsArray. r/sr=bienvenu

mailnews/addrbook/src/nsAbLDAPDirectory.cpp

@@ -1,3 +1,4 @@
+#define MOZ_EXPERIMENTAL_WRITEABLE_LDAP 1
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -165,8 +166,7 @@ NS_IMETHODIMP nsAbLDAPDirectory::GetOperations(PRInt32 *aOperations)
 
 NS_IMETHODIMP nsAbLDAPDirectory::GetChildNodes(nsISimpleEnumerator* *aResult)
 {
-  nsCOMArray<nsIAbDirectory> children;
-  return NS_NewArrayEnumerator(aResult, children);
+  return NS_NewEmptyEnumerator(aResult);
 }
 
 NS_IMETHODIMP nsAbLDAPDirectory::GetChildCards(nsISimpleEnumerator** result)

mailnews/addrbook/src/nsAbMDBDirectory.cpp

@@ -53,6 +53,7 @@
 #include "nsAbDirectoryQuery.h"
 #include "nsIAbDirectoryQueryProxy.h"
 #include "nsAbQueryStringToExpression.h"
+#include "nsIMutableArray.h"
 #include "nsArrayEnumerator.h"
 #include "nsAbMDBCardProperty.h"
 #include "nsEnumeratorUtils.h"
@@ -437,10 +438,7 @@ NS_IMETHODIMP nsAbMDBDirectory::GetURI(nsACString &aURI)
 NS_IMETHODIMP nsAbMDBDirectory::GetChildNodes(nsISimpleEnumerator* *aResult)
 {
   if (mIsQueryURI)
-  {
-    nsCOMArray<nsIAbDirectory> children;
-    return NS_NewArrayEnumerator(aResult, children);
-  }
+    return NS_NewEmptyEnumerator(aResult);
 
   mInitialized = PR_TRUE;
   return NS_NewArrayEnumerator(aResult, mSubDirectories);
@@ -448,11 +446,11 @@ NS_IMETHODIMP nsAbMDBDirectory::GetChildNodes(nsISimpleEnumerator* *aResult)
 
 PR_STATIC_CALLBACK(PRBool) enumerateSearchCache(nsHashKey *aKey, void *aData, void* closure)
 {
-        nsISupportsArray* array = (nsISupportsArray* )closure;
-  nsIAbCard* card = (nsIAbCard* )aData;
+  nsIMutableArray* array = static_cast<nsIMutableArray*>(closure);
+  nsIAbCard* card = static_cast<nsIAbCard*>(aData);
 
-  array->AppendElement (card);
-        return PR_TRUE;
+  array->AppendElement(card, PR_FALSE);
+  return PR_TRUE;
 }
 
 NS_IMETHODIMP nsAbMDBDirectory::GetChildCards(nsISimpleEnumerator* *result)
@@ -466,8 +464,7 @@ NS_IMETHODIMP nsAbMDBDirectory::GetChildCards(nsISimpleEnumerator* *result)
     // TODO
     // Search is synchronous so need to return
     // results after search is complete
-    nsCOMPtr<nsISupportsArray> array;
-    NS_NewISupportsArray(getter_AddRefs(array));
+    nsCOMPtr<nsIMutableArray> array(do_CreateInstance(NS_ARRAY_CONTRACTID));
     mSearchCache.Enumerate(enumerateSearchCache, (void*)array);
     return NS_NewArrayEnumerator(result, array);
   }

mailnews/addrbook/src/nsAbOutlookDirectory.cpp

@@ -239,20 +239,20 @@ NS_IMETHODIMP nsAbOutlookDirectory::GetURI(nsACString &aURI)
 
 NS_IMETHODIMP nsAbOutlookDirectory::GetChildNodes(nsISimpleEnumerator **aNodes)
 {
-    if (!aNodes) { return NS_ERROR_NULL_POINTER ; }
-    *aNodes = nsnull ;
-    nsCOMPtr<nsISupportsArray> nodeList ;
-    nsresult retCode = NS_OK ;
+  NS_ENSURE_ARG_POINTER(aNodes);
+
+  *aNodes = nsnull;
     
-    if (mIsQueryURI) {
-        NS_NewISupportsArray(getter_AddRefs(nodeList)) ;
-    }
-    else {
-        retCode = GetChildNodes(getter_AddRefs(nodeList)) ;
-    }
-    if (NS_SUCCEEDED(retCode))
-      retCode = NS_NewArrayEnumerator(aNodes, nodeList);
-    return retCode;
+  if (mIsQueryURI) {
+    return NS_NewEmptyEnumerator(aNodes);
+  }
+
+  nsresult rv;
+  nsCOMPtr<nsISupportsArray> nodeList;
+  rv = GetChildNodes(getter_AddRefs(nodeList));
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  return NS_NewArrayEnumerator(aNodes, nodeList);
 }
 
 NS_IMETHODIMP nsAbOutlookDirectory::GetChildCards(nsISimpleEnumerator **aCards)

mailnews/base/src/nsMsgRDFDataSource.cpp

@@ -247,14 +247,7 @@ nsMsgRDFDataSource::HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc, PRB
 NS_IMETHODIMP
 nsMsgRDFDataSource::ArcLabelsIn(nsIRDFNode *aNode, nsISimpleEnumerator **_retval)
 {
- //return empty enumerator
-  nsCOMPtr<nsISupportsArray> arcs;
-
-  nsresult rv = NS_NewISupportsArray(getter_AddRefs(arcs));
-  if(NS_FAILED(rv))
-    return rv;
-
-  return NS_NewArrayEnumerator(_retval, arcs);
+  return NS_NewEmptyEnumerator(_retval);
 }
 
 

mailnews/base/src/nsSubscribeDataSource.cpp

@@ -48,6 +48,8 @@
 #include "nsCOMPtr.h"
 #include "nsIMsgFolder.h"
 #include "nsIMsgIncomingServer.h"
+#include "nsIMutableArray.h"
+#include "nsArrayEnumerator.h"
 
 static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
 
@@ -597,22 +599,21 @@ nsSubscribeDataSource::ArcLabelsOut(nsIRDFResource *source,
         return NS_NewEmptyEnumerator(labels);
     }
 
-    nsCOMPtr<nsISupportsArray> array;
-    rv = NS_NewISupportsArray(getter_AddRefs(array));
+    nsCOMPtr<nsIMutableArray> array(do_CreateInstance(NS_ARRAY_CONTRACTID, &rv));
     NS_ENSURE_SUCCESS(rv,rv);
 
-    array->AppendElement(kNC_Subscribed);
-    array->AppendElement(kNC_Subscribable);
-    array->AppendElement(kNC_Name);
-    array->AppendElement(kNC_ServerType);
-    array->AppendElement(kNC_LeafName);
+    array->AppendElement(kNC_Subscribed, PR_FALSE);
+    array->AppendElement(kNC_Subscribable, PR_FALSE);
+    array->AppendElement(kNC_Name, PR_FALSE);
+    array->AppendElement(kNC_ServerType, PR_FALSE);
+    array->AppendElement(kNC_LeafName, PR_FALSE);
 
     PRBool hasChildren = PR_FALSE;
     rv = server->HasChildren(relativePath, &hasChildren);
     NS_ENSURE_SUCCESS(rv,rv);
 
     if (hasChildren) {
-        array->AppendElement(kNC_Child);
+        array->AppendElement(kNC_Child, PR_FALSE);
     }
 
     return NS_NewArrayEnumerator(labels, array);