Changeset 3460

Show
Ignore:
Timestamp:
12/15/06 00:20:10 (2 years ago)
Author:
timothy
Message:

Removing the retain/autorelease idiom for accessor methods.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Additions/NSBundleAdditions.m

    r3072 r3460  
    99        NSString *label = [self objectForInfoDictionaryKey:@"CFBundleName"]; 
    1010        if( ! label ) label = [self bundleIdentifier]; 
    11         return [[label retain] autorelease]; 
     11        return label; 
    1212} 
    1313@end 

  • trunk/Controllers/JVChatRoomBrowser.m

    r3418 r3460  
    233233 
    234234- (NSString *) filter { 
    235         return [[_currentFilter retain] autorelease]; 
     235        return _currentFilter; 
    236236} 
    237237 
    …… 
    265265 
    266266- (MVChatConnection *) connection { 
    267         return [[_connection retain] autorelease]; 
     267        return _connection; 
    268268} 
    269269 

  • trunk/Controllers/JVChatWindowController.m

    r3452 r3460  
    317317 
    318318- (id <JVChatViewController>) activeChatViewController { 
    319         return [[_activeViewController retain] autorelease]; 
     319        return _activeViewController; 
    320320} 
    321321 

  • trunk/Controllers/JVInspectorController.m

    r3418 r3460  
    127127 
    128128- (id <JVInspection>) inspectedObject { 
    129         return [[_object retain] autorelease]; 
     129        return _object; 
    130130} 
    131131 
    132132- (id <JVInspector>) inspector { 
    133         return [[_inspector retain] autorelease]; 
     133        return _inspector; 
    134134} 
    135135 

  • trunk/Controllers/MVBuddyListController.m

    r3259 r3460  
    577577- (void) clear:(id) sender { 
    578578        if( [buddies selectedRow] == -1 ) return; 
    579         JVBuddy *buddy = [[[_buddyOrder objectAtIndex:[buddies selectedRow]] retain] autorelease]; 
     579        JVBuddy *buddy = [[_buddyOrder objectAtIndex:[buddies selectedRow]] retain]; 
    580580        [_buddyList removeObject:buddy]; 
    581581        [_onlineBuddies removeObject:buddy]; 
    582582        [_buddyOrder removeObjectIdenticalTo:buddy]; 
     583        [buddy release]; 
    583584        [self _manuallySortAndUpdate]; 
    584585        [self _saveBuddyList]; 
    …… 
    10221023 
    10231024- (void) removeFromBuddiesAtIndex:(unsigned) index { 
    1024         JVBuddy *buddy = [[[_buddyOrder objectAtIndex:index] retain] autorelease]; 
     1025        JVBuddy *buddy = [[_buddyOrder objectAtIndex:index] retain]; 
    10251026        [_buddyList removeObject:buddy]; 
    10261027        [_onlineBuddies removeObject:buddy]; 
    10271028        [_buddyOrder removeObjectIdenticalTo:buddy]; 
     1029        [buddy release]; 
    10281030        [self _manuallySortAndUpdate]; 
    10291031        [self _saveBuddyList]; 

  • trunk/Controllers/MVConnectionsController.m

    r3418 r3460  
    587587                        [ret addObject:[info objectForKey:@"connection"]]; 
    588588 
    589         return [[ret retain] autorelease]; 
     589        return ret; 
    590590} 
    591591 
    …… 
    653653 
    654654- (void) removeConnectionAtIndex:(unsigned) index { 
    655         MVChatConnection *connection = [[[[_bookmarks objectAtIndex:index] objectForKey:@"connection"] retain] autorelease]; 
     655        MVChatConnection *connection = [[[_bookmarks objectAtIndex:index] objectForKey:@"connection"] retain]; 
    656656    if( ! connection ) return; 
    657657 
    …… 
    666666        [[MVKeyChain defaultKeyChain] setInternetPassword:nil forServer:[connection server] securityDomain:[connection server] account:nil path:nil port:[connection serverPort] protocol:MVKeyChainProtocolIRC authenticationType:MVKeyChainAuthenticationTypeDefault]; 
    667667 
     668        [connection release]; 
     669 
    668670        [_bookmarks removeObjectAtIndex:index]; 
    669671        [self _saveBookmarkList]; 
    …… 
    677679        [info setObject:connection forKey:@"connection"]; 
    678680 
    679         MVChatConnection *oldConnection = [[[[_bookmarks objectAtIndex:index] objectForKey:@"connection"] retain] autorelease]; 
     681        MVChatConnection *oldConnection = [[[_bookmarks objectAtIndex:index] objectForKey:@"connection"] retain]; 
    680682        NSString *quitMessage = [[NSUserDefaults standardUserDefaults] stringForKey:@"JVQuitMessage"]; 
    681683        NSAttributedString *quitMessageString = [[NSAttributedString alloc] initWithString:quitMessage];  
    …… 
    687689        [[MVKeyChain defaultKeyChain] setInternetPassword:nil forServer:[oldConnection server] securityDomain:[oldConnection server] account:[oldConnection nickname] path:nil port:0 protocol:MVKeyChainProtocolIRC authenticationType:MVKeyChainAuthenticationTypeDefault]; 
    688690        [[MVKeyChain defaultKeyChain] setInternetPassword:nil forServer:[oldConnection server] securityDomain:[oldConnection server] account:nil path:nil port:[oldConnection serverPort] protocol:MVKeyChainProtocolIRC authenticationType:MVKeyChainAuthenticationTypeDefault]; 
     691 
     692        [oldConnection release]; 
    689693 
    690694        [_bookmarks replaceObjectAtIndex:index withObject:info]; 
    …… 
    10951099                        [menu removeItem:[[menu itemArray] lastObject]]; 
    10961100 
    1097                 return [[menu retain] autorelease]; 
     1101                return menu; 
    10981102        } 
    10991103 
    …… 
    12141218                if( [[info draggingPasteboard] availableTypeFromArray:[NSArray arrayWithObject:MVConnectionPboardType]] ) { 
    12151219                        int index = -1; 
    1216                         id item = nil; 
    12171220                        [[[info draggingPasteboard] dataForType:MVConnectionPboardType] getBytes:&index]; 
    12181221                        if( row > index ) row--; 
    1219                         item = [[[_bookmarks objectAtIndex:index] retain] autorelease]; 
     1222 
     1223                        id item = [[_bookmarks objectAtIndex:index] retain]; 
    12201224                        [_bookmarks removeObjectAtIndex:index]; 
    12211225                        [_bookmarks insertObject:item atIndex:row]; 
     1226                        [item release]; 
     1227 
    12221228                        [self _refresh:nil]; 
    12231229                        return YES; 

  • trunk/Controllers/MVFileTransferController.m

    r3387 r3460  
    1818        else if( size >= pow( 1024., 3. ) && size < pow( 1024., 4. ) ) ret = [NSString stringWithFormat:NSLocalizedString( @"%.3f GB", "file size measured in gigabytes" ), ( size / pow( 1024., 3. ) )]; 
    1919        else if( size >= pow( 1024., 4. ) ) ret = [NSString stringWithFormat:NSLocalizedString( @"%.4f TB", "file size measured in terabytes" ), ( size / pow( 1024., 4. ) )]; 
    20         return [[ret retain] autorelease]; 
     20        return ret; 
    2121} 
    2222 
    …… 
    5353        } 
    5454 
    55         return [[retval retain] autorelease]; 
     55        return retval; 
    5656} 
    5757 

  • trunk/Models/KAIgnoreRule.m

    r3418 r3460  
    125125 
    126126- (NSArray *) rooms { 
    127     return [[_rooms retain] autorelease]; 
     127    return _rooms; 
    128128} 
    129129 
    …… 
    136136 
    137137- (NSString *) message { 
    138     return [[_ignoredMessage retain] autorelease]; 
     138    return _ignoredMessage; 
    139139} 
    140140 
    …… 
    155155 
    156156- (NSString *) user { 
    157     return [[_ignoredUser retain] autorelease]; 
     157    return _ignoredUser; 
    158158} 
    159159 

  • trunk/Panels/JVChatConsolePanel.m

    r3418 r3460  
    9595 
    9696- (JVChatWindowController *) windowController { 
    97         return [[_windowController retain] autorelease]; 
     97        return _windowController; 
    9898} 
    9999 
    …… 
    183183        [menu addItem:item]; 
    184184 
    185         return [[menu retain] autorelease]; 
     185        return menu; 
    186186} 
    187187 
    …… 
    573573- (NSArray *) toolbarDefaultItemIdentifiers:(NSToolbar *) toolbar { 
    574574        NSArray *list = [NSArray arrayWithObjects:JVToolbarToggleChatDrawerItemIdentifier, JVToolbarClearItemIdentifier, nil]; 
    575         return [[list retain] autorelease]; 
     575        return list; 
    576576} 
    577577 
    578578- (NSArray *) toolbarAllowedItemIdentifiers:(NSToolbar *) toolbar { 
    579579        NSArray *list = [NSArray arrayWithObjects:JVToolbarToggleChatDrawerItemIdentifier, JVToolbarToggleVerboseItemIdentifier, JVToolbarTogglePrivateMessagesItemIdentifier, JVToolbarClearItemIdentifier, NSToolbarCustomizeToolbarItemIdentifier, NSToolbarFlexibleSpaceItemIdentifier, NSToolbarSpaceItemIdentifier, NSToolbarSeparatorItemIdentifier, nil]; 
    580         return [[list retain] autorelease]; 
     580        return list; 
    581581} 
    582582 

  • trunk/Panels/JVChatTranscriptPanel.m

    r3434 r3460  
    149149 
    150150- (JVChatWindowController *) windowController { 
    151         return [[_windowController retain] autorelease]; 
     151        return _windowController; 
    152152} 
    153153 
    …… 
    247247        [menu addItem:item]; 
    248248 
    249         return [[menu retain] autorelease]; 
     249        return menu; 
    250250} 
    251251 
    …… 
    253253        NSImage *ret = [NSImage imageNamed:@"Generic"]; 
    254254        [ret setSize:NSMakeSize( 32., 32. )]; 
    255         return [[ret retain] autorelease]; 
     255        return ret; 
    256256} 
    257257 
    …… 
    805805 
    806806- (NSMenu *) _stylesMenu { 
    807         return [[_styleMenu retain] autorelease]; 
     807        return _styleMenu; 
    808808} 
    809809 
    …… 
    922922        if( [_emoticonMenu itemWithTag:20] ) 
    923923                return [[_emoticonMenu itemWithTag:20] submenu]; 
    924         return [[_emoticonMenu retain] autorelease]; 
     924        return _emoticonMenu; 
    925925} 
    926926 

  • trunk/Panels/JVDirectChatPanel.m

    r3418 r3460  
    326326 
    327327- (id) target { 
    328         return [[_target retain] autorelease]; 
     328        return _target; 
    329329} 
    330330 
    …… 
    358358/*      if( _buddy && [_buddy preferredNameWillReturn] != JVBuddyActiveNickname ) 
    359359                return [_buddy preferredName]; */ 
    360         return [[[[self target] displayName] retain] autorelease]; 
     360        return [[self target] displayName]; 
    361361} 
    362362 
    …… 
    420420        [menu addItem:item]; 
    421421 
    422         return [[menu retain] autorelease]; 
     422        return menu; 
    423423} 
    424424 
    …… 
    525525        } else { 
    526526                if( name && [_waitingAlertNames objectForKey:name] ) { 
    527                         NSPanel *sheet = [[[_waitingAlertNames objectForKey:name] retain] autorelease]; 
     527                        NSPanel *sheet = [[_waitingAlertNames objectForKey:name] retain]; 
     528 
    528529                        if( alert ) { 
    529530                                [_waitingAlerts replaceObjectAtIndex:[_waitingAlerts indexOfObjectIdenticalTo:[_waitingAlertNames objectForKey:name]] withObject:alert]; 
    …… 
    533534                                [_waitingAlertNames removeObjectForKey:name]; 
    534535                        } 
     536 
    535537                        NSReleaseAlertPanel( sheet ); 
     538                        [sheet release]; 
    536539                } else { 
    537540                        if( name && alert ) [_waitingAlertNames setObject:alert forKey:name]; 
    …… 
    561564        NSParameterAssert( key != nil ); 
    562565        NSParameterAssert( [key length] ); 
    563         return [[[_settings objectForKey:key] retain] autorelease]; 
     566        return [_settings objectForKey:key]; 
    564567} 
    565568 
    …… 
    887890 
    888891- (JVMutableChatMessage *) currentMessage { 
    889         return [[_currentMessage retain] autorelease]; 
     892        return _currentMessage; 
    890893} 
    891894 
    …… 
    968971        } 
    969972 
    970         NSDictionary *typingAttributes = [[[send typingAttributes] retain] autorelease]; 
     973        NSDictionary *typingAttributes = [[send typingAttributes] retain]; 
    971974 
    972975        [send reset:nil]; 
    …… 
    974977        if( [[NSUserDefaults standardUserDefaults] boolForKey:@"JVChatInputRetainsFormatting"] ) 
    975978                [send setTypingAttributes:typingAttributes]; 
     979 
     980        [typingAttributes release]; 
    976981 
    977982        [self textDidChange:nil]; 
    …… 
    14301435- (NSMenu *) _encodingMenu { 
    14311436        if( ! _nibLoaded ) [self view]; 
    1432         return [[_encodingMenu retain] autorelease]; 
     1437        return _encodingMenu; 
    14331438} 
    14341439 

  • trunk/Panels/JVSmartTranscriptPanel.m

    r3418 r3460  
    150150        [menu addItem:item]; 
    151151 
    152         return [[menu retain] autorelease]; 
     152        return menu; 
    153153} 
    154154 

  • trunk/Preferences/JVAppearancePreferences.m

    r3459 r3460  
    722722                NSMutableDictionary *options = [_styleOptions objectAtIndex:row]; 
    723723                if( [options objectForKey:@"cell"] ) { 
    724                         return [[[options objectForKey:@"cell"] retain] autorelease]; 
     724                        return [options objectForKey:@"cell"]; 
    725725                } else if( [[options objectForKey:@"type"] isEqualToString:@"color"] ) { 
    726726                        id cell = [[JVColorWellCell new] autorelease]; 

  • trunk/Preferences/JVInterfacePreferences.m

    r3418 r3460  
    3939 
    4040- (NSImage *) imageForPreferenceNamed:(NSString *) name { 
    41         return [[[NSImage imageNamed:@"InterfacePreferences"] retain] autorelease]; 
     41        return [NSImage imageNamed:@"InterfacePreferences"]; 
    4242} 
    4343 
    …… 
    297297                if( row > index ) row--; 
    298298 
    299                 id item = [[[_windowSets objectAtIndex:index] retain] autorelease]; 
     299                id item = [[_windowSets objectAtIndex:index] retain]; 
    300300                [_windowSets removeObjectAtIndex:index]; 
    301301                [_windowSets insertObject:item atIndex:row]; 
     302                [item release]; 
    302303 
    303304                [windowSetsTable selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO]; 

  • trunk/Views/JVColorWellCell.m

    r3418 r3460  
    192192 
    193193- (NSColor *) color { 
    194         return [[_color retain] autorelease]; 
     194        return _color; 
    195195} 
    196196 
    …… 
    212212 
    213213- (id) objectValue { 
    214         return [[_color retain] autorelease]; 
     214        return _color; 
    215215} 
    216216 

  • trunk/Views/JVDetailCell.m

    r3306 r3460  
    5050 
    5151- (NSImage *) statusImage { 
    52         return [[_statusImage retain] autorelease]; 
     52        return _statusImage; 
    5353} 
    5454 
    …… 
    8181 
    8282- (NSImage *) highlightedImage { 
    83         return [[_altImage retain] autorelease]; 
     83        return _altImage; 
    8484} 
    8585 
    …… 
    9292 
    9393- (NSString *) mainText { 
    94         return [[_mainText retain] autorelease]; 
     94        return _mainText; 
    9595} 
    9696 
    …… 
    103103 
    104104- (NSString *) informationText { 
    105         return [[_infoText retain] autorelease]; 
     105        return _infoText; 
    106106} 
    107107 

  • trunk/Views/JVMarkedScroller.m

    r3418 r3460  
    462462 
    463463- (NSSet *) marks { 
    464         return [[_marks retain] autorelease]; 
     464        return _marks; 
    465465} 
    466466 

  • trunk/Views/JVStyleView.m

    r3459 r3460  
    207207 
    208208- (JVStyle *) style { 
    209         return [[_style retain] autorelease]; 
     209        return _style; 
    210210} 
    211211 

  • trunk/Views/MVMenuButton.m

    r3318 r3460  
    129129 
    130130- (NSImage *) smallImage { 
    131         return [[_smallImage retain] autorelease]; 
     131        return _smallImage; 
    132132} 
    133133 
    …… 
    138138 
    139139- (NSToolbarItem *) toolbarItem { 
    140         return [[_toolbarItem retain] autorelease]; 
     140        return _toolbarItem; 
    141141} 
    142142