From a2c8c4faa4d556c08095f569b424f4e96d70e444 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Tue, 28 May 2002 18:42:21 +0000 Subject: [PATCH] fixing some redundant ref counting and a leak of the autocomplete data source. r=hyatt. git-svn-id: svn://10.0.0.236/trunk@122223 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/camino/CHAutoCompleteDataSource.mm | 2 +- mozilla/camino/CHAutoCompleteTextField.mm | 4 ++-- mozilla/camino/src/browser/AutoCompleteDataSource.mm | 2 +- mozilla/camino/src/browser/AutoCompleteTextField.mm | 4 ++-- mozilla/chimera/CHAutoCompleteDataSource.mm | 2 +- mozilla/chimera/CHAutoCompleteTextField.mm | 4 ++-- mozilla/chimera/src/browser/AutoCompleteDataSource.mm | 2 +- mozilla/chimera/src/browser/AutoCompleteTextField.mm | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mozilla/camino/CHAutoCompleteDataSource.mm b/mozilla/camino/CHAutoCompleteDataSource.mm index eab2a47ed9a..0fcd9061ba4 100644 --- a/mozilla/camino/CHAutoCompleteDataSource.mm +++ b/mozilla/camino/CHAutoCompleteDataSource.mm @@ -33,7 +33,7 @@ { if ((self = [super init])) { mResults = nil; - mIconImage = [[NSImage imageNamed:@"globe_ico"] autorelease]; + mIconImage = [NSImage imageNamed:@"globe_ico"]; } return self; } diff --git a/mozilla/camino/CHAutoCompleteTextField.mm b/mozilla/camino/CHAutoCompleteTextField.mm index f2e1e5b9c23..12519e285fe 100644 --- a/mozilla/camino/CHAutoCompleteTextField.mm +++ b/mozilla/camino/CHAutoCompleteTextField.mm @@ -96,7 +96,7 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [mTableView setAction:@selector(onRowClicked:)]; // Create the icon column if we have a proxy icon - if (mProxyIcon != nil) { + if (mProxyIcon) { column = [[[NSTableColumn alloc] initWithIdentifier:@"icon"] autorelease]; [column setWidth:[mProxyIcon frame].origin.x + [mProxyIcon frame].size.width]; dataCell = [[[NSImageCell alloc] initImageCell:nil] autorelease]; @@ -121,7 +121,7 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [scrollView setDocumentView: mTableView]; // construct the datasource - mDataSource = [[[CHAutoCompleteDataSource alloc] init] retain]; + mDataSource = [[CHAutoCompleteDataSource alloc] init]; [mTableView setDataSource: mDataSource]; [mPopupWin setContentView:scrollView]; diff --git a/mozilla/camino/src/browser/AutoCompleteDataSource.mm b/mozilla/camino/src/browser/AutoCompleteDataSource.mm index eab2a47ed9a..0fcd9061ba4 100644 --- a/mozilla/camino/src/browser/AutoCompleteDataSource.mm +++ b/mozilla/camino/src/browser/AutoCompleteDataSource.mm @@ -33,7 +33,7 @@ { if ((self = [super init])) { mResults = nil; - mIconImage = [[NSImage imageNamed:@"globe_ico"] autorelease]; + mIconImage = [NSImage imageNamed:@"globe_ico"]; } return self; } diff --git a/mozilla/camino/src/browser/AutoCompleteTextField.mm b/mozilla/camino/src/browser/AutoCompleteTextField.mm index f2e1e5b9c23..12519e285fe 100644 --- a/mozilla/camino/src/browser/AutoCompleteTextField.mm +++ b/mozilla/camino/src/browser/AutoCompleteTextField.mm @@ -96,7 +96,7 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [mTableView setAction:@selector(onRowClicked:)]; // Create the icon column if we have a proxy icon - if (mProxyIcon != nil) { + if (mProxyIcon) { column = [[[NSTableColumn alloc] initWithIdentifier:@"icon"] autorelease]; [column setWidth:[mProxyIcon frame].origin.x + [mProxyIcon frame].size.width]; dataCell = [[[NSImageCell alloc] initImageCell:nil] autorelease]; @@ -121,7 +121,7 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [scrollView setDocumentView: mTableView]; // construct the datasource - mDataSource = [[[CHAutoCompleteDataSource alloc] init] retain]; + mDataSource = [[CHAutoCompleteDataSource alloc] init]; [mTableView setDataSource: mDataSource]; [mPopupWin setContentView:scrollView]; diff --git a/mozilla/chimera/CHAutoCompleteDataSource.mm b/mozilla/chimera/CHAutoCompleteDataSource.mm index eab2a47ed9a..0fcd9061ba4 100644 --- a/mozilla/chimera/CHAutoCompleteDataSource.mm +++ b/mozilla/chimera/CHAutoCompleteDataSource.mm @@ -33,7 +33,7 @@ { if ((self = [super init])) { mResults = nil; - mIconImage = [[NSImage imageNamed:@"globe_ico"] autorelease]; + mIconImage = [NSImage imageNamed:@"globe_ico"]; } return self; } diff --git a/mozilla/chimera/CHAutoCompleteTextField.mm b/mozilla/chimera/CHAutoCompleteTextField.mm index f2e1e5b9c23..12519e285fe 100644 --- a/mozilla/chimera/CHAutoCompleteTextField.mm +++ b/mozilla/chimera/CHAutoCompleteTextField.mm @@ -96,7 +96,7 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [mTableView setAction:@selector(onRowClicked:)]; // Create the icon column if we have a proxy icon - if (mProxyIcon != nil) { + if (mProxyIcon) { column = [[[NSTableColumn alloc] initWithIdentifier:@"icon"] autorelease]; [column setWidth:[mProxyIcon frame].origin.x + [mProxyIcon frame].size.width]; dataCell = [[[NSImageCell alloc] initImageCell:nil] autorelease]; @@ -121,7 +121,7 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [scrollView setDocumentView: mTableView]; // construct the datasource - mDataSource = [[[CHAutoCompleteDataSource alloc] init] retain]; + mDataSource = [[CHAutoCompleteDataSource alloc] init]; [mTableView setDataSource: mDataSource]; [mPopupWin setContentView:scrollView]; diff --git a/mozilla/chimera/src/browser/AutoCompleteDataSource.mm b/mozilla/chimera/src/browser/AutoCompleteDataSource.mm index eab2a47ed9a..0fcd9061ba4 100644 --- a/mozilla/chimera/src/browser/AutoCompleteDataSource.mm +++ b/mozilla/chimera/src/browser/AutoCompleteDataSource.mm @@ -33,7 +33,7 @@ { if ((self = [super init])) { mResults = nil; - mIconImage = [[NSImage imageNamed:@"globe_ico"] autorelease]; + mIconImage = [NSImage imageNamed:@"globe_ico"]; } return self; } diff --git a/mozilla/chimera/src/browser/AutoCompleteTextField.mm b/mozilla/chimera/src/browser/AutoCompleteTextField.mm index f2e1e5b9c23..12519e285fe 100644 --- a/mozilla/chimera/src/browser/AutoCompleteTextField.mm +++ b/mozilla/chimera/src/browser/AutoCompleteTextField.mm @@ -96,7 +96,7 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [mTableView setAction:@selector(onRowClicked:)]; // Create the icon column if we have a proxy icon - if (mProxyIcon != nil) { + if (mProxyIcon) { column = [[[NSTableColumn alloc] initWithIdentifier:@"icon"] autorelease]; [column setWidth:[mProxyIcon frame].origin.x + [mProxyIcon frame].size.width]; dataCell = [[[NSImageCell alloc] initImageCell:nil] autorelease]; @@ -121,7 +121,7 @@ NS_IMPL_ISUPPORTS1(AutoCompleteListener, nsIAutoCompleteListener) [scrollView setDocumentView: mTableView]; // construct the datasource - mDataSource = [[[CHAutoCompleteDataSource alloc] init] retain]; + mDataSource = [[CHAutoCompleteDataSource alloc] init]; [mTableView setDataSource: mDataSource]; [mPopupWin setContentView:scrollView];