Replaced some AddRef() and Release() calls with the XP-COM macros

This commit is contained in:
troy%netscape.com 1998-09-17 20:02:04 +00:00
parent c1b711408e
commit 94de21e214
19 changed files with 26 additions and 26 deletions

View File

@ -102,7 +102,7 @@ nsresult nsAppShell::QueryInterface(const nsIID& aIID, void** aInstancePtr)
if (result == NS_NOINTERFACE && aIID.Equals(kInsAppShellIID)) {
nsIAppShell* shell = this;
*aInstancePtr = (void*)shell;
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}

View File

@ -64,7 +64,7 @@ nsresult nsButton::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kIButton, NS_IBUTTON_IID);
if (aIID.Equals(kIButton)) {
*aInstancePtr = (void*) ((nsIButton*)this);
AddRef();
NS_ADDREF_THIS();
return NS_OK;
}

View File

@ -66,7 +66,7 @@ nsresult nsCheckButton::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kICheckButtonIID, NS_ICHECKBUTTON_IID);
if (aIID.Equals(kICheckButtonIID)) {
*aInstancePtr = (void*) ((nsICheckButton*)this);
AddRef();
NS_ADDREF_THIS();
return NS_OK;
}
return nsWindow::QueryInterface(aIID,aInstancePtr);

View File

@ -172,12 +172,12 @@ nsresult nsComboBox::QueryInterface(const nsIID& aIID, void** aInstancePtr)
if (aIID.Equals(kInsComboBoxIID)) {
*aInstancePtr = (void*) ((nsIComboBox*)this);
AddRef();
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kInsListWidgetIID)) {
*aInstancePtr = (void*) ((nsIListWidget*)this);
AddRef();
NS_ADDREF_THIS();
return NS_OK;
}

View File

@ -132,7 +132,7 @@ nsresult nsDialog::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kInsDialogIID, NS_IDIALOG_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsDialogIID)) {
*aInstancePtr = (void*) ((nsIDialog*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}

View File

@ -197,7 +197,7 @@ nsresult nsFileWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kInsFileWidgetIID, NS_IFILEWIDGET_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsFileWidgetIID)) {
*aInstancePtr = (void*) ((nsIFileWidget*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}

View File

@ -72,7 +72,7 @@ nsresult nsLabel::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kILabelIID, NS_ILABEL_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kILabelIID)) {
*aInstancePtr = (void*) ((nsILabel*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}

View File

@ -251,12 +251,12 @@ nsresult nsListBox::QueryInterface(const nsIID& aIID, void** aInstancePtr)
if (result == NS_NOINTERFACE) {
if (aIID.Equals(kInsListBoxIID)) {
*aInstancePtr = (void*) ((nsIListBox*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}
else if (aIID.Equals(kInsListWidgetIID)) {
*aInstancePtr = (void*) ((nsIListWidget*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}
}

View File

@ -42,7 +42,7 @@ nsresult nsLookAndFeel::QueryInterface(const nsIID& aIID, void** aInstancePtr)
if (result == NS_NOINTERFACE && aIID.Equals(kILookAndFeelIID)) {
*aInstancePtr = (void*) ((nsILookAndFeel*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}

View File

@ -79,7 +79,7 @@ nsresult nsObject::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (aIID.Equals(kISupportsIID)) {
*aInstancePtr = (void*) ((nsISupports*)this);
AddRef();
NS_ADDREF_THIS();
return NS_OK;
}

View File

@ -59,7 +59,7 @@ nsresult nsRadioButton::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kIRadioButtonIID, NS_IRADIOBUTTON_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kIRadioButtonIID)) {
*aInstancePtr = (void*) ((nsIRadioButton*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}
return result;

View File

@ -181,7 +181,7 @@ nsresult nsRadioGroup::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kInsRadioGroupIID, NS_IRADIOGROUP_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsRadioGroupIID)) {
*aInstancePtr = (void*) ((nsIRadioGroup*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}
@ -263,7 +263,7 @@ nsIEnumerator* nsRadioGroup::GetChildren()
{
if (mChildren) {
mChildren->Reset();
mChildren->AddRef();
NS_ADDREF(mChildren);
return mChildren;
}
@ -317,7 +317,7 @@ NS_IMPL_ISUPPORTS(nsRadioGroup::Enumerator, NS_IENUMERATOR_IID);
nsISupports* nsRadioGroup::Enumerator::Next()
{
if (mCurrentPosition < mArraySize && mChildrens[mCurrentPosition]) {
mChildrens[mCurrentPosition]->AddRef();
NS_ADDREF(mChildrens[mCurrentPosition]);
return mChildrens[mCurrentPosition++];
}
@ -351,7 +351,7 @@ void nsRadioGroup::Enumerator::Append(nsIRadioButton* aRadioButton)
GrowArray();
}
mChildrens[pos] = aRadioButton;
aRadioButton->AddRef();
NS_ADDREF(aRadioButton);
}
}

View File

@ -64,7 +64,7 @@ nsresult nsScrollbar::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kInsScrollbarIID, NS_ISCROLLBAR_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsScrollbarIID)) {
*aInstancePtr = (void*) ((nsIScrollbar*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}

View File

@ -62,7 +62,7 @@ nsresult nsTabWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kInsTabWidgetIID, NS_ITABWIDGET_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsTabWidgetIID)) {
*aInstancePtr = (void*) ((nsITabWidget*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}

View File

@ -80,14 +80,14 @@ nsresult nsTextAreaWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr
if (aIID.Equals(kITextAreaWidgetIID)) {
nsITextAreaWidget* textArea = this;
*aInstancePtr = (void*) (textArea);
AddRef();
NS_ADDREF_THIS();
return NS_OK;
}
else if (aIID.Equals(kIWidgetIID))
{
nsIWidget* widget = this;
*aInstancePtr = (void*) (widget);
AddRef();
NS_ADDREF_THIS();
return NS_OK;
}

View File

@ -58,7 +58,7 @@ nsresult nsTextWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kInsTextWidgetIID, NS_ITEXTWIDGET_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsTextWidgetIID)) {
*aInstancePtr = (void*) ((nsITextWidget*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}

View File

@ -62,7 +62,7 @@ nsresult nsTooltipWidget::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kInsTooltipWidgetIID, NS_ITOOLTIPWIDGET_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsTooltipWidgetIID)) {
*aInstancePtr = (void*) ((nsITooltipWidget*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}

View File

@ -125,7 +125,7 @@ nsresult nsWidgetFactory::QueryInterface(const nsIID &aIID,
return NS_NOINTERFACE;
}
AddRef(); // Increase reference count for caller
NS_ADDREF_THIS(); // Increase reference count for caller
return NS_OK;
}

View File

@ -429,7 +429,7 @@ nsresult nsWindow::QueryInterface(const nsIID& aIID, void** aInstancePtr)
static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kIWidgetIID)) {
*aInstancePtr = (void*) ((nsIWidget*)this);
AddRef();
NS_ADDREF_THIS();
result = NS_OK;
}
@ -732,7 +732,7 @@ nsIWidget* nsWindow::GetParent(void)
if (widget->mIsDestroying) {
widget = NULL;
} else {
widget->AddRef();
NS_ADDREF(widget);
}
}
}