diff --git a/mozilla/modules/libreg/xpcom/nsRegistry.cpp b/mozilla/modules/libreg/xpcom/nsRegistry.cpp index 0d26c07efb3..4ca49984db9 100644 --- a/mozilla/modules/libreg/xpcom/nsRegistry.cpp +++ b/mozilla/modules/libreg/xpcom/nsRegistry.cpp @@ -100,12 +100,12 @@ struct nsRegSubtreeEnumerator : public nsIEnumerator { NS_DECL_ISUPPORTS // This class implements the nsIEnumerator interface functions. - nsresult First(); - nsresult Last(); - nsresult Next(); - nsresult Prev(); - nsresult CurrentItem(nsISupports **aItem); - nsresult IsDone(); + NS_IMETHOD First(); + NS_IMETHOD Last(); + NS_IMETHOD Next(); + NS_IMETHOD Prev(); + NS_IMETHOD CurrentItem(nsISupports **aItem); + NS_IMETHOD IsDone(); // ctor/dtor nsRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all ); @@ -839,7 +839,8 @@ nsRegSubtreeEnumerator::nsRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all | the beginning. We then do a Next() call in order to do a "lookahead" to | | properly detect an empty list (i.e., set the mDone flag). | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::First() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::First() { nsresult rv = NS_OK; // Reset "done" flag. mDone = PR_FALSE; @@ -853,7 +854,8 @@ nsresult nsRegSubtreeEnumerator::First() { /*----------------------- nsRegSubtreeEnumerator::Last ------------------------- | This can't be implemented using the libreg functions. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::Last() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::Last() { nsresult rv = NS_ERROR_NOT_IMPLEMENTED; return rv; } @@ -866,7 +868,8 @@ nsresult nsRegSubtreeEnumerator::Last() { | lookahead buffer. We must then call advance to lookahead and properly set | | the isDone flag. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::Next() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::Next() { nsresult rv = NS_OK; // Check for at end. if ( !mDone ) { @@ -902,7 +905,8 @@ NS_IMETHODIMP nsRegSubtreeEnumerator::advance() { /*----------------------- nsRegSubtreeEnumerator::Prev ------------------------- | This can't be implemented on top of libreg. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::Prev() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::Prev() { nsresult rv = NS_ERROR_NOT_IMPLEMENTED; return rv; } @@ -912,7 +916,8 @@ nsresult nsRegSubtreeEnumerator::Prev() { | object will hold the curent mEnum value so it can obtain its name from | | the registry when asked. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { +NS_IMETHODIMP +nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { nsresult rv = NS_OK; // Make sure there is a place to put the result. if( result ) { @@ -931,7 +936,8 @@ nsresult nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { /*---------------------- nsRegSubtreeEnumerator::IsDone ------------------------ | Simply return mDone. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::IsDone() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::IsDone() { nsresult rv = mDone; return rv; } @@ -950,7 +956,8 @@ nsRegValueEnumerator::nsRegValueEnumerator( HREG hReg, RKEY rKey ) | As the nsRegSubtreeEnumerator counterpart, but allocates an object of | | class nsRegistryValue. | ------------------------------------------------------------------------------*/ -nsresult nsRegValueEnumerator::CurrentItem( nsISupports **result ) { +NS_IMETHODIMP +nsRegValueEnumerator::CurrentItem( nsISupports **result ) { nsresult rv = NS_OK; // Make sure there is a place to put the result. if( result ) { diff --git a/mozilla/widget/src/windows/nsRadioGroup.cpp b/mozilla/widget/src/windows/nsRadioGroup.cpp index a1b91817496..3965f87d44d 100644 --- a/mozilla/widget/src/windows/nsRadioGroup.cpp +++ b/mozilla/widget/src/windows/nsRadioGroup.cpp @@ -294,7 +294,7 @@ NS_IMPL_ISUPPORTS(nsRadioGroup::Enumerator, NS_IENUMERATOR_IID); -nsresult +NS_IMETHODIMP nsRadioGroup::Enumerator::Next() { if (mCurrentPosition < (mArraySize -1) ) @@ -306,7 +306,7 @@ nsRadioGroup::Enumerator::Next() -nsresult +NS_IMETHODIMP nsRadioGroup::Enumerator::Prev() { if (mCurrentPosition > 0 ) @@ -318,7 +318,7 @@ nsRadioGroup::Enumerator::Prev() -nsresult +NS_IMETHODIMP nsRadioGroup::Enumerator::CurrentItem(nsISupports **aItem) { if (!aItem) @@ -335,7 +335,7 @@ nsRadioGroup::Enumerator::CurrentItem(nsISupports **aItem) -nsresult +NS_IMETHODIMP nsRadioGroup::Enumerator::First() { if (mArraySize && mChildrens[0]) { @@ -350,7 +350,7 @@ nsRadioGroup::Enumerator::First() -nsresult +NS_IMETHODIMP nsRadioGroup::Enumerator::Last() { if (mArraySize && mChildrens[0]) { @@ -365,7 +365,7 @@ nsRadioGroup::Enumerator::Last() -nsresult +NS_IMETHODIMP nsRadioGroup::Enumerator::IsDone() { if ((mCurrentPosition == (mArraySize -1)) || mArraySize <= 0 ){ //empty lists always return done diff --git a/mozilla/widget/src/windows/nsRadioGroup.h b/mozilla/widget/src/windows/nsRadioGroup.h index fc21bcc4b19..6c55c27a4b1 100644 --- a/mozilla/widget/src/windows/nsRadioGroup.h +++ b/mozilla/widget/src/windows/nsRadioGroup.h @@ -70,12 +70,12 @@ protected: Enumerator(); virtual ~Enumerator(); - virtual nsresult First(); - virtual nsresult Last(); - virtual nsresult Next(); - virtual nsresult Prev(); - virtual nsresult CurrentItem(nsISupports **aItem); - virtual nsresult IsDone(); + NS_IMETHOD First(); + NS_IMETHOD Last(); + NS_IMETHOD Next(); + NS_IMETHOD Prev(); + NS_IMETHOD CurrentItem(nsISupports **aItem); + NS_IMETHOD IsDone(); void Append(nsIRadioButton* aWidget); void Remove(nsIRadioButton* aWidget); diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp index 9b78d56fdcd..963fffc31d3 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp @@ -452,7 +452,7 @@ nsBaseWidget::Enumerator::~Enumerator() //enumerator interfaces -nsresult +NS_IMETHODIMP nsBaseWidget::Enumerator::Next() { if (mCurrentPosition < (mChildren.Count() -1) ) @@ -464,7 +464,7 @@ nsBaseWidget::Enumerator::Next() -nsresult +NS_IMETHODIMP nsBaseWidget::Enumerator::Prev() { if (mCurrentPosition > 0 ) @@ -476,7 +476,7 @@ nsBaseWidget::Enumerator::Prev() -nsresult +NS_IMETHODIMP nsBaseWidget::Enumerator::CurrentItem(nsISupports **aItem) { @@ -495,7 +495,7 @@ nsBaseWidget::Enumerator::CurrentItem(nsISupports **aItem) -nsresult +NS_IMETHODIMP nsBaseWidget::Enumerator::First() { if (mChildren.Count()) { @@ -510,7 +510,7 @@ nsBaseWidget::Enumerator::First() -nsresult +NS_IMETHODIMP nsBaseWidget::Enumerator::Last() { if (mChildren.Count() ) { @@ -525,7 +525,7 @@ nsBaseWidget::Enumerator::Last() -nsresult +NS_IMETHODIMP nsBaseWidget::Enumerator::IsDone() { if ((mCurrentPosition == (mChildren.Count() -1)) || mChildren.Count() <= 0 ){ //empty lists always return done diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.h b/mozilla/widget/src/xpwidgets/nsBaseWidget.h index 01818286e5f..6a106293c27 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseWidget.h +++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.h @@ -132,12 +132,12 @@ protected: Enumerator(); ~Enumerator(); - virtual nsresult First(); - virtual nsresult Last(); - virtual nsresult Next(); - virtual nsresult Prev(); - virtual nsresult CurrentItem(nsISupports **aItem); - virtual nsresult IsDone(); + NS_IMETHOD First(); + NS_IMETHOD Last(); + NS_IMETHOD Next(); + NS_IMETHOD Prev(); + NS_IMETHOD CurrentItem(nsISupports **aItem); + NS_IMETHOD IsDone(); void Append(nsIWidget* aWidget); void Remove(nsIWidget* aWidget); diff --git a/mozilla/xpcom/components/mozRegistry.cpp b/mozilla/xpcom/components/mozRegistry.cpp index 45506bd6141..6150d4b4313 100644 --- a/mozilla/xpcom/components/mozRegistry.cpp +++ b/mozilla/xpcom/components/mozRegistry.cpp @@ -100,12 +100,12 @@ struct mozRegSubtreeEnumerator : public nsIEnumerator { NS_DECL_ISUPPORTS // This class implements the nsIEnumerator interface functions. - nsresult First(); - nsresult Last(); - nsresult Next(); - nsresult Prev(); - nsresult CurrentItem(nsISupports **aItem); - nsresult IsDone(); + NS_IMETHOD First(); + NS_IMETHOD Last(); + NS_IMETHOD Next(); + NS_IMETHOD Prev(); + NS_IMETHOD CurrentItem(nsISupports **aItem); + NS_IMETHOD IsDone(); // ctor/dtor mozRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all ); @@ -839,7 +839,8 @@ mozRegSubtreeEnumerator::mozRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool a | the beginning. We then do a Next() call in order to do a "lookahead" to | | properly detect an empty list (i.e., set the mDone flag). | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::First() { +NS_IMETHODIMP +mozRegSubtreeEnumerator::First() { nsresult rv = NS_OK; // Reset "done" flag. mDone = PR_FALSE; @@ -853,7 +854,8 @@ nsresult mozRegSubtreeEnumerator::First() { /*---------------------- mozRegSubtreeEnumerator::Last ------------------------- | This can't be implemented using the libreg functions. | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::Last() { +NS_IMETHODIMP +mozRegSubtreeEnumerator::Last() { nsresult rv = NS_ERROR_NOT_IMPLEMENTED; return rv; } @@ -866,7 +868,8 @@ nsresult mozRegSubtreeEnumerator::Last() { | lookahead buffer. We must then call advance to lookahead and properly set | | the isDone flag. | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::Next() { +NS_IMETHODIMP +mozRegSubtreeEnumerator::Next() { nsresult rv = NS_OK; // Check for at end. if ( !mDone ) { @@ -902,7 +905,8 @@ NS_IMETHODIMP mozRegSubtreeEnumerator::advance() { /*---------------------- mozRegSubtreeEnumerator::Prev ------------------------- | This can't be implemented on top of libreg. | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::Prev() { +NS_IMETHODIMP +mozRegSubtreeEnumerator::Prev() { nsresult rv = NS_ERROR_NOT_IMPLEMENTED; return rv; } @@ -912,7 +916,8 @@ nsresult mozRegSubtreeEnumerator::Prev() { | object will hold the curent mEnum value so it can obtain its name from | | the registry when asked. | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::CurrentItem( nsISupports **result) { +NS_IMETHODIMP +mozRegSubtreeEnumerator::CurrentItem( nsISupports **result) { nsresult rv = NS_OK; // Make sure there is a place to put the result. if( result ) { @@ -931,7 +936,8 @@ nsresult mozRegSubtreeEnumerator::CurrentItem( nsISupports **result) { /*--------------------- mozRegSubtreeEnumerator::IsDone ------------------------ | Simply return mDone. | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::IsDone() { +NS_IMETHODIMP +mozRegSubtreeEnumerator::IsDone() { nsresult rv = mDone; return rv; } @@ -950,7 +956,8 @@ mozRegValueEnumerator::mozRegValueEnumerator( HREG hReg, RKEY rKey ) | As the mozRegSubtreeEnumerator counterpart, but allocates an object of | | class mozRegistryValue. | ------------------------------------------------------------------------------*/ -nsresult mozRegValueEnumerator::CurrentItem( nsISupports **result ) { +NS_IMETHODIMP +mozRegValueEnumerator::CurrentItem( nsISupports **result ) { nsresult rv = NS_OK; // Make sure there is a place to put the result. if( result ) { diff --git a/mozilla/xpcom/components/nsRegistry.cpp b/mozilla/xpcom/components/nsRegistry.cpp index 0d26c07efb3..4ca49984db9 100644 --- a/mozilla/xpcom/components/nsRegistry.cpp +++ b/mozilla/xpcom/components/nsRegistry.cpp @@ -100,12 +100,12 @@ struct nsRegSubtreeEnumerator : public nsIEnumerator { NS_DECL_ISUPPORTS // This class implements the nsIEnumerator interface functions. - nsresult First(); - nsresult Last(); - nsresult Next(); - nsresult Prev(); - nsresult CurrentItem(nsISupports **aItem); - nsresult IsDone(); + NS_IMETHOD First(); + NS_IMETHOD Last(); + NS_IMETHOD Next(); + NS_IMETHOD Prev(); + NS_IMETHOD CurrentItem(nsISupports **aItem); + NS_IMETHOD IsDone(); // ctor/dtor nsRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all ); @@ -839,7 +839,8 @@ nsRegSubtreeEnumerator::nsRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all | the beginning. We then do a Next() call in order to do a "lookahead" to | | properly detect an empty list (i.e., set the mDone flag). | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::First() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::First() { nsresult rv = NS_OK; // Reset "done" flag. mDone = PR_FALSE; @@ -853,7 +854,8 @@ nsresult nsRegSubtreeEnumerator::First() { /*----------------------- nsRegSubtreeEnumerator::Last ------------------------- | This can't be implemented using the libreg functions. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::Last() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::Last() { nsresult rv = NS_ERROR_NOT_IMPLEMENTED; return rv; } @@ -866,7 +868,8 @@ nsresult nsRegSubtreeEnumerator::Last() { | lookahead buffer. We must then call advance to lookahead and properly set | | the isDone flag. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::Next() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::Next() { nsresult rv = NS_OK; // Check for at end. if ( !mDone ) { @@ -902,7 +905,8 @@ NS_IMETHODIMP nsRegSubtreeEnumerator::advance() { /*----------------------- nsRegSubtreeEnumerator::Prev ------------------------- | This can't be implemented on top of libreg. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::Prev() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::Prev() { nsresult rv = NS_ERROR_NOT_IMPLEMENTED; return rv; } @@ -912,7 +916,8 @@ nsresult nsRegSubtreeEnumerator::Prev() { | object will hold the curent mEnum value so it can obtain its name from | | the registry when asked. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { +NS_IMETHODIMP +nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { nsresult rv = NS_OK; // Make sure there is a place to put the result. if( result ) { @@ -931,7 +936,8 @@ nsresult nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { /*---------------------- nsRegSubtreeEnumerator::IsDone ------------------------ | Simply return mDone. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::IsDone() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::IsDone() { nsresult rv = mDone; return rv; } @@ -950,7 +956,8 @@ nsRegValueEnumerator::nsRegValueEnumerator( HREG hReg, RKEY rKey ) | As the nsRegSubtreeEnumerator counterpart, but allocates an object of | | class nsRegistryValue. | ------------------------------------------------------------------------------*/ -nsresult nsRegValueEnumerator::CurrentItem( nsISupports **result ) { +NS_IMETHODIMP +nsRegValueEnumerator::CurrentItem( nsISupports **result ) { nsresult rv = NS_OK; // Make sure there is a place to put the result. if( result ) { diff --git a/mozilla/xpcom/ds/nsIEnumerator.h b/mozilla/xpcom/ds/nsIEnumerator.h index d7876f1e9f4..96a83353866 100644 --- a/mozilla/xpcom/ds/nsIEnumerator.h +++ b/mozilla/xpcom/ds/nsIEnumerator.h @@ -34,30 +34,30 @@ public: /** First will reset the list. will return NS_FAILED if no items */ - virtual nsresult First()=0; + NS_IMETHOD First()=0; /** Last will reset the list to the end. will return NS_FAILED if no items */ - virtual nsresult Last()=0; + NS_IMETHOD Last()=0; /** Next will advance the list. will return failed if allready at end */ - virtual nsresult Next()=0; + NS_IMETHOD Next()=0; /** Prev will decrement the list. will return failed if allready at beginning */ - virtual nsresult Prev()=0; + NS_IMETHOD Prev()=0; /** CurrentItem will return the CurrentItem item it will fail if the list is empty * @param aItem return value */ - virtual nsresult CurrentItem(nsISupports **aItem)=0; + NS_IMETHOD CurrentItem(nsISupports **aItem)=0; /** return if the collection is at the end. that is the beginning following a call to Prev * and it is the end of the list following a call to next * @param aItem return value */ - virtual nsresult IsDone()=0; + NS_IMETHOD IsDone()=0; }; diff --git a/mozilla/xpcom/public/nsIEnumerator.h b/mozilla/xpcom/public/nsIEnumerator.h index d7876f1e9f4..96a83353866 100644 --- a/mozilla/xpcom/public/nsIEnumerator.h +++ b/mozilla/xpcom/public/nsIEnumerator.h @@ -34,30 +34,30 @@ public: /** First will reset the list. will return NS_FAILED if no items */ - virtual nsresult First()=0; + NS_IMETHOD First()=0; /** Last will reset the list to the end. will return NS_FAILED if no items */ - virtual nsresult Last()=0; + NS_IMETHOD Last()=0; /** Next will advance the list. will return failed if allready at end */ - virtual nsresult Next()=0; + NS_IMETHOD Next()=0; /** Prev will decrement the list. will return failed if allready at beginning */ - virtual nsresult Prev()=0; + NS_IMETHOD Prev()=0; /** CurrentItem will return the CurrentItem item it will fail if the list is empty * @param aItem return value */ - virtual nsresult CurrentItem(nsISupports **aItem)=0; + NS_IMETHOD CurrentItem(nsISupports **aItem)=0; /** return if the collection is at the end. that is the beginning following a call to Prev * and it is the end of the list following a call to next * @param aItem return value */ - virtual nsresult IsDone()=0; + NS_IMETHOD IsDone()=0; }; diff --git a/mozilla/xpcom/src/mozRegistry.cpp b/mozilla/xpcom/src/mozRegistry.cpp index 45506bd6141..6150d4b4313 100644 --- a/mozilla/xpcom/src/mozRegistry.cpp +++ b/mozilla/xpcom/src/mozRegistry.cpp @@ -100,12 +100,12 @@ struct mozRegSubtreeEnumerator : public nsIEnumerator { NS_DECL_ISUPPORTS // This class implements the nsIEnumerator interface functions. - nsresult First(); - nsresult Last(); - nsresult Next(); - nsresult Prev(); - nsresult CurrentItem(nsISupports **aItem); - nsresult IsDone(); + NS_IMETHOD First(); + NS_IMETHOD Last(); + NS_IMETHOD Next(); + NS_IMETHOD Prev(); + NS_IMETHOD CurrentItem(nsISupports **aItem); + NS_IMETHOD IsDone(); // ctor/dtor mozRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all ); @@ -839,7 +839,8 @@ mozRegSubtreeEnumerator::mozRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool a | the beginning. We then do a Next() call in order to do a "lookahead" to | | properly detect an empty list (i.e., set the mDone flag). | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::First() { +NS_IMETHODIMP +mozRegSubtreeEnumerator::First() { nsresult rv = NS_OK; // Reset "done" flag. mDone = PR_FALSE; @@ -853,7 +854,8 @@ nsresult mozRegSubtreeEnumerator::First() { /*---------------------- mozRegSubtreeEnumerator::Last ------------------------- | This can't be implemented using the libreg functions. | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::Last() { +NS_IMETHODIMP +mozRegSubtreeEnumerator::Last() { nsresult rv = NS_ERROR_NOT_IMPLEMENTED; return rv; } @@ -866,7 +868,8 @@ nsresult mozRegSubtreeEnumerator::Last() { | lookahead buffer. We must then call advance to lookahead and properly set | | the isDone flag. | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::Next() { +NS_IMETHODIMP +mozRegSubtreeEnumerator::Next() { nsresult rv = NS_OK; // Check for at end. if ( !mDone ) { @@ -902,7 +905,8 @@ NS_IMETHODIMP mozRegSubtreeEnumerator::advance() { /*---------------------- mozRegSubtreeEnumerator::Prev ------------------------- | This can't be implemented on top of libreg. | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::Prev() { +NS_IMETHODIMP +mozRegSubtreeEnumerator::Prev() { nsresult rv = NS_ERROR_NOT_IMPLEMENTED; return rv; } @@ -912,7 +916,8 @@ nsresult mozRegSubtreeEnumerator::Prev() { | object will hold the curent mEnum value so it can obtain its name from | | the registry when asked. | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::CurrentItem( nsISupports **result) { +NS_IMETHODIMP +mozRegSubtreeEnumerator::CurrentItem( nsISupports **result) { nsresult rv = NS_OK; // Make sure there is a place to put the result. if( result ) { @@ -931,7 +936,8 @@ nsresult mozRegSubtreeEnumerator::CurrentItem( nsISupports **result) { /*--------------------- mozRegSubtreeEnumerator::IsDone ------------------------ | Simply return mDone. | ------------------------------------------------------------------------------*/ -nsresult mozRegSubtreeEnumerator::IsDone() { +NS_IMETHODIMP +mozRegSubtreeEnumerator::IsDone() { nsresult rv = mDone; return rv; } @@ -950,7 +956,8 @@ mozRegValueEnumerator::mozRegValueEnumerator( HREG hReg, RKEY rKey ) | As the mozRegSubtreeEnumerator counterpart, but allocates an object of | | class mozRegistryValue. | ------------------------------------------------------------------------------*/ -nsresult mozRegValueEnumerator::CurrentItem( nsISupports **result ) { +NS_IMETHODIMP +mozRegValueEnumerator::CurrentItem( nsISupports **result ) { nsresult rv = NS_OK; // Make sure there is a place to put the result. if( result ) { diff --git a/mozilla/xpcom/src/nsRegistry.cpp b/mozilla/xpcom/src/nsRegistry.cpp index 0d26c07efb3..4ca49984db9 100644 --- a/mozilla/xpcom/src/nsRegistry.cpp +++ b/mozilla/xpcom/src/nsRegistry.cpp @@ -100,12 +100,12 @@ struct nsRegSubtreeEnumerator : public nsIEnumerator { NS_DECL_ISUPPORTS // This class implements the nsIEnumerator interface functions. - nsresult First(); - nsresult Last(); - nsresult Next(); - nsresult Prev(); - nsresult CurrentItem(nsISupports **aItem); - nsresult IsDone(); + NS_IMETHOD First(); + NS_IMETHOD Last(); + NS_IMETHOD Next(); + NS_IMETHOD Prev(); + NS_IMETHOD CurrentItem(nsISupports **aItem); + NS_IMETHOD IsDone(); // ctor/dtor nsRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all ); @@ -839,7 +839,8 @@ nsRegSubtreeEnumerator::nsRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all | the beginning. We then do a Next() call in order to do a "lookahead" to | | properly detect an empty list (i.e., set the mDone flag). | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::First() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::First() { nsresult rv = NS_OK; // Reset "done" flag. mDone = PR_FALSE; @@ -853,7 +854,8 @@ nsresult nsRegSubtreeEnumerator::First() { /*----------------------- nsRegSubtreeEnumerator::Last ------------------------- | This can't be implemented using the libreg functions. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::Last() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::Last() { nsresult rv = NS_ERROR_NOT_IMPLEMENTED; return rv; } @@ -866,7 +868,8 @@ nsresult nsRegSubtreeEnumerator::Last() { | lookahead buffer. We must then call advance to lookahead and properly set | | the isDone flag. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::Next() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::Next() { nsresult rv = NS_OK; // Check for at end. if ( !mDone ) { @@ -902,7 +905,8 @@ NS_IMETHODIMP nsRegSubtreeEnumerator::advance() { /*----------------------- nsRegSubtreeEnumerator::Prev ------------------------- | This can't be implemented on top of libreg. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::Prev() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::Prev() { nsresult rv = NS_ERROR_NOT_IMPLEMENTED; return rv; } @@ -912,7 +916,8 @@ nsresult nsRegSubtreeEnumerator::Prev() { | object will hold the curent mEnum value so it can obtain its name from | | the registry when asked. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { +NS_IMETHODIMP +nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { nsresult rv = NS_OK; // Make sure there is a place to put the result. if( result ) { @@ -931,7 +936,8 @@ nsresult nsRegSubtreeEnumerator::CurrentItem( nsISupports **result) { /*---------------------- nsRegSubtreeEnumerator::IsDone ------------------------ | Simply return mDone. | ------------------------------------------------------------------------------*/ -nsresult nsRegSubtreeEnumerator::IsDone() { +NS_IMETHODIMP +nsRegSubtreeEnumerator::IsDone() { nsresult rv = mDone; return rv; } @@ -950,7 +956,8 @@ nsRegValueEnumerator::nsRegValueEnumerator( HREG hReg, RKEY rKey ) | As the nsRegSubtreeEnumerator counterpart, but allocates an object of | | class nsRegistryValue. | ------------------------------------------------------------------------------*/ -nsresult nsRegValueEnumerator::CurrentItem( nsISupports **result ) { +NS_IMETHODIMP +nsRegValueEnumerator::CurrentItem( nsISupports **result ) { nsresult rv = NS_OK; // Make sure there is a place to put the result. if( result ) { diff --git a/mozilla/xpcom/tests/makefile.win b/mozilla/xpcom/tests/makefile.win index 239f2db0bcc..2928a1eb3cf 100644 --- a/mozilla/xpcom/tests/makefile.win +++ b/mozilla/xpcom/tests/makefile.win @@ -27,7 +27,6 @@ PROG2 = .\$(OBJDIR)\RegFactory.exe PROG3 = .\$(OBJDIR)\TestArray.exe PROG4 = .\$(OBJDIR)\TestID.exe PROG5 = .\$(OBJDIR)\TestServMgr.exe -PROG6 = .\$(OBJDIR)\TestCOMPtr.exe PROGRAMS = $(PROG1) $(PROG2) $(PROG3) $(PROG4) $(PROG5) $(PROG6) LCFLAGS=-DUSE_NSREG -GX @@ -73,5 +72,4 @@ $(PROG2): $(OBJDIR) RegFactory.cpp $(PROG3): $(OBJDIR) TestArray.cpp $(PROG4): $(OBJDIR) TestID.cpp $(PROG5): $(OBJDIR) TestServMgr.cpp -$(PROG6): $(OBJDIR) TestCOMPtr.cpp