зеркало из https://github.com/mozilla/pjs.git
stop using [] operator on nsISupportsArrays - going away for scriptability
This commit is contained in:
Родитель
acbec64692
Коммит
ea143436d6
|
@ -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)) {
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче