From ea143436d6d364e3dc341bf742af12f2e847da0a Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com" <alecf%netscape.com>
Date: Tue, 1 Jun 1999 23:15:03 +0000
Subject: [PATCH] stop using [] operator on nsISupportsArrays - going away for
 scriptability

---
 mailnews/addrbook/src/nsAbCard.cpp              | 2 +-
 mailnews/addrbook/src/nsAbDirectory.cpp         | 2 +-
 mailnews/addrbook/src/nsCardDataSource.cpp      | 6 +++---
 mailnews/addrbook/src/nsDirectoryDataSource.cpp | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mailnews/addrbook/src/nsAbCard.cpp b/mailnews/addrbook/src/nsAbCard.cpp
index 790da438dc2..cf883ef6bd7 100644
--- a/mailnews/addrbook/src/nsAbCard.cpp
+++ b/mailnews/addrbook/src/nsAbCard.cpp
@@ -99,7 +99,7 @@ nsFilterBy(nsISupportsArray* array, nsArrayFilter filter, void* data,
   rv = array->Count(&count);
   NS_ASSERTION(NS_SUCCEEDED(rv), "Count failed");
   for (PRUint32 i = 0; i < count; i++) {
-    nsCOMPtr<nsISupports> element = getter_AddRefs((*array)[i]);
+    nsCOMPtr<nsISupports> element = getter_AddRefs(array->ElementAt(i));
     if (filter(element, data)) {
       rv = f->AppendElement(element);
       if (NS_FAILED(rv)) {
diff --git a/mailnews/addrbook/src/nsAbDirectory.cpp b/mailnews/addrbook/src/nsAbDirectory.cpp
index 1528e9498e9..b10cb0f0929 100644
--- a/mailnews/addrbook/src/nsAbDirectory.cpp
+++ b/mailnews/addrbook/src/nsAbDirectory.cpp
@@ -114,7 +114,7 @@ nsFilterBy(nsISupportsArray* array, nsArrayFilter filter, void* data,
   rv = array->Count(&count);
   NS_ASSERTION(NS_SUCCEEDED(rv), "Count failed");
   for (PRUint32 i = 0; i < count; i++) {
-    nsCOMPtr<nsISupports> element = getter_AddRefs((*array)[i]);
+    nsCOMPtr<nsISupports> element = getter_AddRefs(array->ElementAt(i));
     if (filter(element, data)) {
       rv = f->AppendElement(element);
       if (NS_FAILED(rv)) {
diff --git a/mailnews/addrbook/src/nsCardDataSource.cpp b/mailnews/addrbook/src/nsCardDataSource.cpp
index 8af0251fd11..a218d392c29 100644
--- a/mailnews/addrbook/src/nsCardDataSource.cpp
+++ b/mailnews/addrbook/src/nsCardDataSource.cpp
@@ -534,7 +534,7 @@ nsABCardDataSource::IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSour
   PRUint32 cnt;
   rv = aSources->Count(&cnt);
   for (PRUint32 i = 0; i < cnt; i++) {
-    nsCOMPtr<nsISupports> source = getter_AddRefs((*aSources)[i]);
+    nsCOMPtr<nsISupports> source = getter_AddRefs(aSources->ElementAt(i));
 		card = do_QueryInterface(source, &rv);
     if (NS_SUCCEEDED(rv)) {
       // we don't care about the arguments -- card commands are always enabled
@@ -561,7 +561,7 @@ nsABCardDataSource::DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
   PRUint32 cnt;
   rv = aSources->Count(&cnt);
   for (PRUint32 i = 0; i < cnt; i++) {
-		nsCOMPtr<nsISupports> supports = getter_AddRefs((*aSources)[i]);
+		nsCOMPtr<nsISupports> supports = getter_AddRefs(aSources->ElementAt(i));
     nsCOMPtr<nsIAbCard> card = do_QueryInterface(supports, &rv);
     if (NS_SUCCEEDED(rv)) {
       if (peq(aCommand, kNC_Delete)) {
@@ -693,7 +693,7 @@ nsresult nsABCardDataSource::DoDeleteFromCard(nsIAbCard *card, nsISupportsArray
 nsresult nsABCardDataSource::DoNewCard(nsIAbCard *card, nsISupportsArray *arguments)
 {
 	nsresult rv = NS_OK;
-	nsCOMPtr<nsIRDFLiteral> literal(do_QueryInterface((*arguments)[0], &rv));
+	nsCOMPtr<nsIRDFLiteral> literal(do_QueryInterface(arguments->ElementAt(0), &rv));
 	if(NS_SUCCEEDED(rv))
 	{
 		PRUnichar *name;
diff --git a/mailnews/addrbook/src/nsDirectoryDataSource.cpp b/mailnews/addrbook/src/nsDirectoryDataSource.cpp
index 516e4e9b3e8..162432ed4bb 100644
--- a/mailnews/addrbook/src/nsDirectoryDataSource.cpp
+++ b/mailnews/addrbook/src/nsDirectoryDataSource.cpp
@@ -558,7 +558,7 @@ nsABDirectoryDataSource::IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/*
   PRUint32 cnt;
   rv = aSources->Count(&cnt);
   for (PRUint32 i = 0; i < cnt; i++) {
-    nsCOMPtr<nsISupports> source = getter_AddRefs((*aSources)[i]);
+    nsCOMPtr<nsISupports> source = getter_AddRefs(aSources->ElementAt(i));
 		directory = do_QueryInterface(source, &rv);
     if (NS_SUCCEEDED(rv)) {
       // we don't care about the arguments -- directory commands are always enabled
@@ -585,7 +585,7 @@ nsABDirectoryDataSource::DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSource
   PRUint32 cnt;
   rv = aSources->Count(&cnt);
   for (PRUint32 i = 0; i < cnt; i++) {
-		nsCOMPtr<nsISupports> supports = getter_AddRefs((*aSources)[i]);
+		nsCOMPtr<nsISupports> supports = getter_AddRefs(aSources->ElementAt(i));
     nsCOMPtr<nsIAbDirectory> directory = do_QueryInterface(supports, &rv);
     if (NS_SUCCEEDED(rv)) {
       if (peq(aCommand, kNC_Delete)) {
@@ -739,7 +739,7 @@ nsresult nsABDirectoryDataSource::DoDeleteFromDirectory(nsIAbDirectory *director
 nsresult nsABDirectoryDataSource::DoNewDirectory(nsIAbDirectory *directory, nsISupportsArray *arguments)
 {
 	nsresult rv = NS_OK;
-	nsCOMPtr<nsIRDFLiteral> literal(do_QueryInterface((*arguments)[0], &rv));
+	nsCOMPtr<nsIRDFLiteral> literal(do_QueryInterface(arguments->ElementAt(0), &rv));
 	if(NS_SUCCEEDED(rv))
 	{
 		PRUnichar *name;